@tinacms/schema-tools 0.0.0-20220907211113 → 0.0.0-20220907220830

package/dist/index.d.ts

@@ -13,4 +13,3 @@ limitations under the License.
 export * from './schema';
 export * from './types';
 export * from './validate';
-export * from './util/namer';

package/dist/index.es.js

@@ -214,72 +214,6 @@ class TinaSchema {
           return template;
       }
     };
-    this.transformPayload = (collectionName, payload) => {
-      const collection = this.getCollection(collectionName);
-      if (collection.templates) {
-        const template = collection.templates.find((template2) => {
-          if (typeof template2 === "string") {
-            throw new Error("Global templates not supported");
-          }
-          return payload["_template"] === template2.name;
-        });
-        if (!template) {
-          console.error(payload);
-          throw new Error(`Unable to find template for payload`);
-        }
-        if (typeof template === "string") {
-          throw new Error("Global templates not supported");
-        }
-        return {
-          [collectionName]: {
-            [template.name]: this.transformCollectablePayload(payload, template)
-          }
-        };
-      } else {
-        return {
-          [collectionName]: this.transformCollectablePayload(payload, collection)
-        };
-      }
-    };
-    this.transformCollectablePayload = (payload, collection) => {
-      const accumulator = {};
-      Object.entries(payload).forEach(([key, value]) => {
-        if (typeof collection.fields === "string") {
-          throw new Error("Global templates not supported");
-        }
-        const field = collection.fields.find((field2) => {
-          if (typeof field2 === "string") {
-            throw new Error("Global templates not supported");
-          }
-          return field2.name === key;
-        });
-        if (field) {
-          accumulator[key] = this.transformField(field, value);
-        }
-      });
-      return accumulator;
-    };
-    this.transformField = (field, value) => {
-      if (field.type === "object")
-        if (field.templates) {
-          if (field.list) {
-            assertShape(value, (yup2) => yup2.array(yup2.object({ _template: yup2.string().required() })));
-            return value.map((item) => {
-              const { _template, ...rest } = item;
-              return { [_template]: rest };
-            });
-          } else {
-            assertShape(value, (yup2) => yup2.object({ _template: yup2.string().required() }));
-            const { _template, ...rest } = value;
-            return { [_template]: rest };
-          }
-        } else {
-          return value;
-        }
-      else {
-        return value;
-      }
-    };
     this.isMarkdownCollection = (collectionName) => {
       const collection = this.getCollection(collectionName);
       const format = collection.format;
@@ -330,9 +264,9 @@ class TinaSchema {
     this.schema = config;
   }
 }
-const resolveField = (field, schema) => {
+const resolveField = ({ namespace, ...field }, schema) => {
   var _a;
-  field.parentTypename = NAMER.dataTypeName(field.namespace.filter((_, i) => i < field.namespace.length - 1));
+  field.parentTypename = NAMER.dataTypeName(namespace.filter((_, i) => i < namespace.length - 1));
   const extraFields = field.ui || {};
   switch (field.type) {
     case "number":
@@ -393,7 +327,10 @@ const resolveField = (field, schema) => {
         ...extraFields
       };
     case "object":
-      const templateInfo = schema.getTemplatesForCollectable(field);
+      const templateInfo = schema.getTemplatesForCollectable({
+        ...field,
+        namespace
+      });
       if (templateInfo.type === "object") {
         return {
           ...field,
@@ -411,7 +348,6 @@ const resolveField = (field, schema) => {
           templates2[lastItem(template.namespace)] = {
             label: template.label || templateName,
             key: templateName,
-            namespace: [...field.namespace, templateName],
             fields: template.fields.map((field2) => resolveField(field2, schema)),
             ...extraFields2
           };
@@ -420,7 +356,6 @@ const resolveField = (field, schema) => {
         return {
           ...field,
           typeMap: typeMap2,
-          namespace: field.namespace,
           component: field.list ? "blocks" : "not-implemented",
           templates: templates2,
           ...extraFields
@@ -785,4 +720,4 @@ const validateSchema = ({
     }
   }
 };
-export { NAMER, TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema, validateTinaCloudSchemaConfig };
+export { TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema, validateTinaCloudSchemaConfig };

package/dist/index.js

@@ -241,72 +241,6 @@
             return template;
         }
       };
-      this.transformPayload = (collectionName, payload) => {
-        const collection = this.getCollection(collectionName);
-        if (collection.templates) {
-          const template = collection.templates.find((template2) => {
-            if (typeof template2 === "string") {
-              throw new Error("Global templates not supported");
-            }
-            return payload["_template"] === template2.name;
-          });
-          if (!template) {
-            console.error(payload);
-            throw new Error(`Unable to find template for payload`);
-          }
-          if (typeof template === "string") {
-            throw new Error("Global templates not supported");
-          }
-          return {
-            [collectionName]: {
-              [template.name]: this.transformCollectablePayload(payload, template)
-            }
-          };
-        } else {
-          return {
-            [collectionName]: this.transformCollectablePayload(payload, collection)
-          };
-        }
-      };
-      this.transformCollectablePayload = (payload, collection) => {
-        const accumulator = {};
-        Object.entries(payload).forEach(([key, value]) => {
-          if (typeof collection.fields === "string") {
-            throw new Error("Global templates not supported");
-          }
-          const field = collection.fields.find((field2) => {
-            if (typeof field2 === "string") {
-              throw new Error("Global templates not supported");
-            }
-            return field2.name === key;
-          });
-          if (field) {
-            accumulator[key] = this.transformField(field, value);
-          }
-        });
-        return accumulator;
-      };
-      this.transformField = (field, value) => {
-        if (field.type === "object")
-          if (field.templates) {
-            if (field.list) {
-              assertShape(value, (yup2) => yup2.array(yup2.object({ _template: yup2.string().required() })));
-              return value.map((item) => {
-                const { _template, ...rest } = item;
-                return { [_template]: rest };
-              });
-            } else {
-              assertShape(value, (yup2) => yup2.object({ _template: yup2.string().required() }));
-              const { _template, ...rest } = value;
-              return { [_template]: rest };
-            }
-          } else {
-            return value;
-          }
-        else {
-          return value;
-        }
-      };
       this.isMarkdownCollection = (collectionName) => {
         const collection = this.getCollection(collectionName);
         const format = collection.format;
@@ -357,9 +291,9 @@
       this.schema = config;
     }
   }
-  const resolveField = (field, schema) => {
+  const resolveField = ({ namespace, ...field }, schema) => {
     var _a;
-    field.parentTypename = NAMER.dataTypeName(field.namespace.filter((_, i) => i < field.namespace.length - 1));
+    field.parentTypename = NAMER.dataTypeName(namespace.filter((_, i) => i < namespace.length - 1));
     const extraFields = field.ui || {};
     switch (field.type) {
       case "number":
@@ -420,7 +354,10 @@
           ...extraFields
         };
       case "object":
-        const templateInfo = schema.getTemplatesForCollectable(field);
+        const templateInfo = schema.getTemplatesForCollectable({
+          ...field,
+          namespace
+        });
         if (templateInfo.type === "object") {
           return {
             ...field,
@@ -438,7 +375,6 @@
             templates2[lastItem(template.namespace)] = {
               label: template.label || templateName,
               key: templateName,
-              namespace: [...field.namespace, templateName],
               fields: template.fields.map((field2) => resolveField(field2, schema)),
               ...extraFields2
             };
@@ -447,7 +383,6 @@
           return {
             ...field,
             typeMap: typeMap2,
-            namespace: field.namespace,
             component: field.list ? "blocks" : "not-implemented",
             templates: templates2,
             ...extraFields
@@ -812,7 +747,6 @@
       }
     }
   };
-  exports2.NAMER = NAMER;
   exports2.TinaSchema = TinaSchema;
   exports2.TinaSchemaValidationError = TinaSchemaValidationError;
   exports2.addNamespaceToSchema = addNamespaceToSchema;

package/dist/schema/TinaSchema.d.ts

@@ -64,13 +64,6 @@ export declare class TinaSchema {
         data?: unknown;
         collection: Collectable;
     }) => Templateable;
-    transformPayload: (collectionName: string, payload: object) => {
-        [x: string]: {
-            [x: string]: {};
-        };
-    };
-    private transformCollectablePayload;
-    private transformField;
     isMarkdownCollection: (collectionName: string) => boolean;
     /**
      * Gets the template or templates from the item.

package/dist/schema/resolveField.d.ts

@@ -21,9 +21,4 @@ import { TinaSchema } from './TinaSchema';
  * @param  {TinaSchema} schema the entireT Tina Schema
  * @returns unknown
  */
-export declare const resolveField: (field: TinaFieldEnriched, schema: TinaSchema) => {
-    [key: string]: unknown;
-    name: string;
-    component: string;
-    type: string;
-};
+export declare const resolveField: ({ namespace, ...field }: TinaFieldEnriched, schema: TinaSchema) => unknown;

package/dist/schema/resolveForm.d.ts

@@ -18,10 +18,5 @@ export declare const resolveForm: ({ collection, basename, template, schema, }:
     id: string;
     label: string;
     name: string;
-    fields: {
-        [key: string]: unknown;
-        name: string;
-        component: string;
-        type: string;
-    }[];
+    fields: unknown[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "0.0.0-20220907211113",
+  "version": "0.0.0-20220907220830",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {