@tinacms/schema-tools 1.6.9 → 1.7.0

package/dist/index.js

@@ -20,42 +20,26 @@
   }
   const yup__namespace = /* @__PURE__ */ _interopNamespaceDefault(yup);
   function addNamespaceToSchema(maybeNode, namespace = []) {
-    if (typeof maybeNode === "string") {
+    if (typeof maybeNode !== "object" || maybeNode === null) {
       return maybeNode;
     }
-    if (typeof maybeNode === "boolean") {
-      return maybeNode;
-    }
-    if (typeof maybeNode === "function") {
-      return maybeNode;
-    }
-    const newNode = { ...maybeNode };
-    const keys = Object.keys(maybeNode);
-    Object.values(maybeNode).map((m, index) => {
-      const key = keys[index];
-      if (Array.isArray(m)) {
-        newNode[key] = m.map((element) => {
-          if (!element) {
-            return;
+    const newNode = { ...maybeNode, namespace: [...namespace] };
+    Object.entries(maybeNode).forEach(([key, value]) => {
+      if (Array.isArray(value)) {
+        newNode[key] = value.map((element) => {
+          if (element && typeof element === "object" && "name" in element) {
+            const valueName = element.name || element.value;
+            return addNamespaceToSchema(element, [...namespace, valueName]);
           }
-          if (!element.hasOwnProperty("name")) {
-            return element;
-          }
-          const value = element.name || element.value;
-          return addNamespaceToSchema(element, [...namespace, value]);
+          return element;
         });
+      } else if (value && typeof value === "object" && "name" in value) {
+        newNode[key] = addNamespaceToSchema(value, [...namespace, value.name]);
       } else {
-        if (!m) {
-          return;
-        }
-        if (!m.hasOwnProperty("name")) {
-          newNode[key] = m;
-        } else {
-          newNode[key] = addNamespaceToSchema(m, [...namespace, m.name]);
-        }
+        newNode[key] = value;
       }
     });
-    return { ...newNode, namespace };
+    return newNode;
   }
   function getDefaultExportFromCjs(x) {
     return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;

package/dist/index.mjs

@@ -2,42 +2,26 @@ import * as yup from "yup";
 import UrlPattern from "url-pattern";
 import z$1, { z, ZodError } from "zod";
 function addNamespaceToSchema(maybeNode, namespace = []) {
-  if (typeof maybeNode === "string") {
+  if (typeof maybeNode !== "object" || maybeNode === null) {
     return maybeNode;
   }
-  if (typeof maybeNode === "boolean") {
-    return maybeNode;
-  }
-  if (typeof maybeNode === "function") {
-    return maybeNode;
-  }
-  const newNode = { ...maybeNode };
-  const keys = Object.keys(maybeNode);
-  Object.values(maybeNode).map((m, index) => {
-    const key = keys[index];
-    if (Array.isArray(m)) {
-      newNode[key] = m.map((element) => {
-        if (!element) {
-          return;
+  const newNode = { ...maybeNode, namespace: [...namespace] };
+  Object.entries(maybeNode).forEach(([key, value]) => {
+    if (Array.isArray(value)) {
+      newNode[key] = value.map((element) => {
+        if (element && typeof element === "object" && "name" in element) {
+          const valueName = element.name || element.value;
+          return addNamespaceToSchema(element, [...namespace, valueName]);
         }
-        if (!element.hasOwnProperty("name")) {
-          return element;
-        }
-        const value = element.name || element.value;
-        return addNamespaceToSchema(element, [...namespace, value]);
+        return element;
       });
+    } else if (value && typeof value === "object" && "name" in value) {
+      newNode[key] = addNamespaceToSchema(value, [...namespace, value.name]);
     } else {
-      if (!m) {
-        return;
-      }
-      if (!m.hasOwnProperty("name")) {
-        newNode[key] = m;
-      } else {
-        newNode[key] = addNamespaceToSchema(m, [...namespace, m.name]);
-      }
+      newNode[key] = value;
     }
   });
-  return { ...newNode, namespace };
+  return newNode;
 }
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;

package/dist/schema/addNamespaceToSchema.d.ts

@@ -1,4 +1,8 @@
-/**
-
-*/
-export declare function addNamespaceToSchema<T extends object | string>(maybeNode: T, namespace?: string[]): T;
+type Node = {
+    name?: string;
+    value?: string;
+    namespace?: string[];
+    [key: string]: any;
+};
+export declare function addNamespaceToSchema<T extends Node | string>(maybeNode: T, namespace?: string[]): T;
+export {};

package/dist/types/index.d.ts

@@ -198,8 +198,14 @@ export type RichTextField<WithNamespace extends boolean = false> = (FieldGeneric
      * will be stored as frontmatter
      */
     isBody?: boolean;
+    /**@deprecated use overrides.toolbar */
     toolbarOverride?: ToolbarOverrideType[];
     templates?: RichTextTemplate<WithNamespace>[];
+    overrides?: {
+        toolbar?: ToolbarOverrideType[];
+        /**Default set to true */
+        showFloatingToolbar?: boolean;
+    };
     /**
      * By default, Tina parses markdown with MDX, this is a more strict parser
      * that allows you to use structured content inside markdown (via `templates`).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "1.6.9",
+  "version": "1.7.0",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {