|
@@ -62,16 +62,16 @@ const autoMeta = model => Object.entries(model)
|
|
|
// Combine automatically generated metadata with overrides
|
|
|
// ---------------------------------------------------------------------------------------------------------------------
|
|
|
|
|
|
-// metaGSeed = Metadata from group which seeds all fields contained in the group
|
|
|
+// containerSeed = Metadata from container which seeds all contained fields
|
|
|
|
|
|
-const combineMetaForField = (metaF, metaGSeed, extraMetaF) => Object.assign(metaF, metaGSeed, extraMetaF);
|
|
|
-const combineExtraMeta = (metaG, extraMeta, createFromExtra = false, metaGSeed = {}) => {
|
|
|
+const combineMetaForField = (metaF, containerSeed, extraMetaF) => Object.assign(metaF, containerSeed, extraMetaF);
|
|
|
+const combineExtraMeta = (metaG, extraMeta, createFromExtra = false, containerSeed = {}) => {
|
|
|
const combinedMeta = {};
|
|
|
Object.entries(extraMeta).forEach(([key, val]) => {
|
|
|
if (typeof metaG[key] === 'object' || createFromExtra) {
|
|
|
const isCon = isContainer(val);
|
|
|
const metaFoG = metaG[key] || {};
|
|
|
- const seed = isCon ? {} : metaGSeed;
|
|
|
+ const seed = isCon ? {} : containerSeed; // Container's don't seed thenselves
|
|
|
const extra = isCon ?
|
|
|
{
|
|
|
...val,
|
|
@@ -79,7 +79,7 @@ const combineExtraMeta = (metaG, extraMeta, createFromExtra = false, metaGSeed =
|
|
|
metaFoG.meta || {},
|
|
|
val['meta'],
|
|
|
createFromExtra,
|
|
|
- val['seed'] || metaGSeed // Inherit seeded data if this group's seed isn't set
|
|
|
+ val['seed'] || containerSeed // Inherit seeded data if this group's seed isn't set
|
|
|
)
|
|
|
}
|
|
|
:
|