npm - @stackbit/sdk - Versions diffs - 0.2.27 → 0.2.30 - Mend

@stackbit/sdk 0.2.27 → 0.2.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/dist/config/config-loader.js +27 -30
package/dist/config/config-loader.js.map +1 -1
package/dist/consts.d.ts +1 -0
package/dist/consts.js +2 -1
package/dist/consts.js.map +1 -1
package/dist/content/content-loader.js +1 -1
package/dist/content/content-loader.js.map +1 -1
package/dist/content/content-validator.js +5 -5
package/dist/content/content-validator.js.map +1 -1
package/dist/utils/model-matcher.js +5 -5
package/dist/utils/model-matcher.js.map +1 -1
package/package.json +4 -3
package/src/config/config-loader.ts +29 -36
package/src/consts.ts +1 -0
package/src/content/content-loader.ts +13 -6
package/src/content/content-validator.ts +4 -4
package/src/utils/model-matcher.ts +6 -6
package/src/.DS_Store +0 -0

package/dist/config/config-loader.js CHANGED Viewed

@@ -282,28 +282,28 @@ function mergeConfigWithExternalModels(config, externalModels) {
             type: modelType,
             urlPath
         }));
-        externalModel = utils_1.mapModelFieldsRecursively(externalModel, (field, modelKeyPath) => {
+        externalModel = utils_1.mapModelFieldsRecursively(externalModel, (externalField, modelKeyPath) => {
             const stackbitField = utils_1.getModelFieldForModelKeyPath(stackbitModel, modelKeyPath);
             if (!stackbitField) {
-                return field;
+                return externalField;
             }
             let override = {};
-            if (stackbitField.type === 'style') {
+            if (externalField.type === 'json' && stackbitField.type === 'style') {
                 override = stackbitField;
             }
-            else if (field.type === 'enum') {
-                override = lodash_1.default.pick(stackbitField, ['options']);
-            }
-            else if (field.type === 'color') {
+            else if (externalField.type === 'string' && stackbitField.type === 'color') {
                 override = { type: 'color' };
             }
-            else if (field.type === 'number') {
+            else if (externalField.type === 'enum') {
+                override = lodash_1.default.pick(stackbitField, ['options']);
+            }
+            else if (externalField.type === 'number') {
                 override = lodash_1.default.pick(stackbitField, ['subtype', 'min', 'max', 'step', 'unit']);
             }
-            else if (field.type === 'object') {
+            else if (externalField.type === 'object') {
                 override = lodash_1.default.pick(stackbitField, ['labelField', 'thumbnail', 'fieldGroups']);
             }
-            return Object.assign({}, field, lodash_1.default.pick(stackbitField, ['label', 'description', 'required', 'default', 'group', 'const', 'hidden', 'readOnly', 'controlType']), override);
+            return Object.assign({}, externalField, lodash_1.default.pick(stackbitField, ['label', 'description', 'required', 'default', 'group', 'const', 'hidden', 'readOnly', 'controlType']), override);
         });
         models[modelName] = externalModel;
     });
@@ -323,7 +323,6 @@ function normalizeConfig(config) {
     const isStackbitYamlV2 = ver ? semver_1.default.satisfies(ver, '<0.3.0') : false;
     const models = (config === null || config === void 0 ? void 0 : config.models) || {};
     const gitCMS = isGitCMS(config);
-    let referencedModelNames = [];
     lodash_1.default.forEach(models, (model, modelName) => {
         if (!model) {
             return;
@@ -345,13 +344,22 @@ function normalizeConfig(config) {
             if (gitCMS) {
                 updatePageFilePath(model, config);
                 addMarkdownContentField(model);
-                // TODO: update schema-editor to not show layout field
-                addLayoutFieldToPageModel(model, pageLayoutKey);
             }
         }
         else if (utils_1.isDataModel(model) && gitCMS) {
             updateDataFilePath(model, config);
         }
+        if (gitCMS) {
+            // TODO: do not add pageLayoutKey and objectTypeKey fields to models,
+            //  The content validator should always assume these fields.
+            //  And when new objects created from UI, it should add these fields automatically.
+            if (utils_1.isPageModel(model)) {
+                addLayoutFieldToPageModel(model, pageLayoutKey, modelName);
+            }
+            else if (utils_1.isDataModel(model) && !utils_1.isListDataModel(model)) {
+                addObjectTypeKeyField(model, objectTypeKey, modelName);
+            }
+        }
         if (utils_1.isListDataModel(model)) {
             // 'items.type' of list model defaults to 'string', set it explicitly
             if (!lodash_1.default.has(model, 'items.type')) {
@@ -405,22 +413,8 @@ function normalizeConfig(config) {
                     field.models = lodash_1.default.get(field, 'models', []);
                 }
             }
-            if (gitCMS) {
-                referencedModelNames = lodash_1.default.union(referencedModelNames, getReferencedModelNames(field));
-            }
         });
     });
-    lodash_1.default.forEach(referencedModelNames, (modelName) => {
-        const model = models[modelName];
-        // don't add objectTypeKey to page models, they have pageLayoutKey
-        if (!model || model.type === 'page') {
-            return;
-        }
-        // TODO: update schema-editor to not show type field
-        // TODO: do not add objectTypeKey field to models, API/container should
-        //  be able to add it automatically when data object or polymorphic nested model is added
-        addObjectTypeKeyField(model, objectTypeKey, modelName);
-    });
     return config;
 }
 function updatePageUrlPath(model) {
@@ -490,7 +484,10 @@ function addMarkdownContentField(model) {
         description: 'Page content'
     });
 }
-function addLayoutFieldToPageModel(model, pageLayoutKey) {
+function addLayoutFieldToPageModel(model, pageLayoutKey, modelName) {
+    if (lodash_1.default.intersection(lodash_1.default.keys(model), ['file', 'folder', 'match', 'exclude']).length === 0 && !lodash_1.default.get(model, 'layout')) {
+        model.layout = modelName;
+    }
     const modelLayout = lodash_1.default.get(model, 'layout');
     if (!modelLayout) {
         return;
@@ -499,7 +496,7 @@ function addLayoutFieldToPageModel(model, pageLayoutKey) {
     if (hasLayoutField) {
         return;
     }
-    utils_2.append(model, 'fields', {
+    utils_2.prepend(model, 'fields', {
         type: 'string',
         name: pageLayoutKey,
         label: lodash_1.default.startCase(pageLayoutKey),
@@ -512,7 +509,7 @@ function addObjectTypeKeyField(model, objectTypeKey, modelName) {
     if (hasObjectTypeField) {
         return;
     }
-    utils_2.append(model, 'fields', {
+    utils_2.prepend(model, 'fields', {
         type: 'string',
         name: objectTypeKey,
         label: 'Object Type',

package/dist/config/config-loader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,wDAA2B;AAC3B,sDAA2B;AAC3B,oDAA4B;AAC5B,oDAAuB;AAEvB,yDAAmG;AACnG,mDAAsF;AACtF,oCAkBkB;AAClB,2CAAmH;AAEnH,qDAA+C;AAwBxC,KAAK,UAAU,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAuB;IAC3E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAE9E,IAAI,CAAC,MAAM,EAAE;QACT,OAAO;YACH,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,gBAAgB;SAC3B,CAAC;KACL;IAED,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,4BAA4B,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAEvI,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAE5E,MAAM,aAAa,GAAG,MAAM,4BAAW,CAAC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE1E,OAAO;QACH,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,MAAM,EAAE,CAAC,GAAG,gBAAgB,EAAE,GAAG,wBAAwB,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC;KAClH,CAAC;AACN,CAAC;AAtBD,gCAsBC;AAED,SAAgB,0BAA0B,CAAC,MAA2B,EAAE,cAAwB;IAC5F,qDAAqD;IACrD,kEAAkE;IAClE,mFAAmF;IACnF,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,sBAAc,CAAC,MAAM,CAAC,MAAa,CAAC,CAAC;IACnG,MAAM,cAAc,GAAG;QACnB,GAAG,MAAM;QACT,MAAM,EAAE,cAAc;KACzB,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,yBAAyB,EAAE,GAAG,6BAA6B,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAElI,6EAA6E;IAC7E,6FAA6F;IAC7F,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,8BAA8B,CAAC,YAAY,CAAC,CAAC;IAErH,uHAAuH;IACvH,oCAAoC;IACpC,MAAM,gBAAgB,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;IAElE,kBAAkB;IAClB,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,iCAAc,CAAC,gBAAgB,CAAC,CAAC;IAE9F,MAAM,MAAM,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,yBAAyB,EAAE,GAAG,mBAAmB,EAAE,GAAG,gBAAgB,CAAC,CAAC;IAEjH,OAAO,yBAAyB,CAAC;QAC7B,KAAK,EAAE,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QACxB,KAAK,EAAE,eAAe;QACtB,MAAM,EAAE,MAAM;KACjB,CAAC,CAAC;AACP,CAAC;AA9BD,gEA8BC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAe;;IAC5C,IAAI;QACA,MAAM,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,CAAC;QACrE,IAAI,kBAAkB,CAAC,KAAK,EAAE;YAC1B,OAAO,EAAE,MAAM,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;SACjD;QAED,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE5H,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAA,kBAAkB,CAAC,MAAM,CAAC,MAAM,mCAAI,EAAE,EAAE,eAAe,CAAC,CAAC;QAEnH,OAAO;YACH,MAAM,EAAE;gBACJ,GAAG,kBAAkB,CAAC,MAAM;gBAC5B,MAAM,EAAE,YAAY;aACvB;YACD,MAAM,EAAE,gBAAgB;SAC3B,CAAC;KACL;IAAC,OAAO,KAAU,EAAE;QACjB,OAAO;YACH,MAAM,EAAE,CAAC,IAAI,+BAAe,CAAC,yCAAyC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;SACpH,CAAC;KACL;AACL,CAAC;AAID,KAAK,UAAU,0BAA0B,CAAC,OAAe;IACrD,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,MAAM,kBAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAClE,IAAI,CAAC,kBAAkB,EAAE;QACrB,OAAO;YACH,KAAK,EAAE,IAAI,+BAAe,CAAC,gHAAgH,CAAC;SAC/I,CAAC;KACL;IACD,MAAM,YAAY,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,iBAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,iBAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACtF,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACvC,OAAO;YACH,KAAK,EAAE,IAAI,+BAAe,CAAC,gHAAgH,CAAC;SAC/I,CAAC;KACL;IACD,OAAO,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,MAA2B;IAC3E,MAAM,YAAY,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,CAAC,0CAA0C,EAAE,kBAAkB,CAAC,CAAC;IAC1F,MAAM,SAAS,GACX,UAAU,KAAK,OAAO;QAClB,CAAC,CAAC,gBAAC,CAAC,SAAS,CAAC,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,gBAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClH,CAAC,CAAC,gBAAgB,CAAC;IAE3B,MAAM,UAAU,GAAG,MAAM,qBAAa,CAClC,SAAS,EACT,KAAK,EAAE,UAAoB,EAAE,QAAQ,EAAE,EAAE;QACrC,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,MAAM,kBAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,UAAU,CAAC;SACrB;QACD,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACxD,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC,EACD,EAAE,CACL,CAAC;IAEF,OAAO,qBAAa,CAChB,UAAU,EACV,KAAK,EAAE,MAAkD,EAAE,SAAS,EAAE,EAAE;QACpE,IAAI,KAAK,CAAC;QACV,IAAI;YACA,KAAK,GAAG,MAAM,iBAAS,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;SAC1D;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO;gBACH,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,+BAAe,CAAC,8BAA8B,SAAS,EAAE,CAAC,CAAC;aAC/F,CAAC;SACL;QACD,MAAM,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC;QAC9B,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;gBACH,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,+BAAe,CAAC,qCAAqC,SAAS,EAAE,CAAC,CAAC;aACtG,CAAC;SACL;QACD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,GAAG;YAClC,QAAQ,EAAE,SAAS;SACtB,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC,EACD,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAC7B,CAAC;AACN,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,SAAiB;IAClD,OAAO,MAAM,0BAAkB,CAAC,SAAS,EAAE;QACvC,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YACxB,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACrB,OAAO,IAAI,CAAC;aACf;YACD,MAAM,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACtD,OAAO,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACjE,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,4BAA4B,CACvC,MAA2B,EAC3B,OAAe,EACf,YAA2B;IAE3B,YAAY,GAAG,gBAAC,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,UAAU,KAAK,OAAO,EAAE;QACxB,0EAA0E;QAC1E,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;KACrC;SAAM,IAAI,UAAU,KAAK,YAAY,EAAE;QACpC,MAAM,gBAAgB,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,0BAA0B,CAAC,CAAC;QACnF,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,wDAAa,UAAU,GAAC,CAAC;QACxC,IAAI;YACA,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;YAChG,OAAO;gBACH,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,EAAE;aACb,CAAC;SACL;QAAC,OAAO,KAAU,EAAE;YACjB,OAAO;gBACH,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,CAAC,IAAI,+BAAe,CAAC,2DAA2D,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;aACtI,CAAC;SACL;KACJ;IACD,OAAO;QACH,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,CAAC,IAAI,+BAAe,CAAC,gBAAgB,YAAY,iBAAiB,CAAC,CAAC;KAC/E,CAAC;AACN,CAAC;AAED,6DAA6D;AAC7D,KAAK,UAAU,yBAAyB,CAAC,OAAe;IACpD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACxD,MAAM,iBAAiB,GAAG,MAAM,kBAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAChE,IAAI,CAAC,iBAAiB,EAAE;QACpB,OAAO,IAAI,CAAC;KACf;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,eAAe,EAAE;QACjB,MAAM,WAAW,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClD,gBAAC,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;KACjC;IAED,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,gBAAgB,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvD,IAAI,gBAAgB,EAAE;QAClB,MAAM,YAAY,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpD,gBAAC,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KAClC;IAED,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,gBAAgB,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvD,IAAI,gBAAgB,EAAE;QAClB,MAAM,YAAY,GAAG,MAAM,kBAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACpD,gBAAC,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;KAClC;IAED,OAAO,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,oCAAoC,CAAC,YAAiB,EAAE,eAAoC;IACjG,MAAM,YAAY,GAAG,gBAAC,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE;;QAC3E,iDAAiD;QACjD,MAAM,aAAa,GAAG,MAAA,aAAa,CAAC,UAAU,0CAAE,QAAQ,CAAC;QACzD,4BAA4B,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC3D,qCAA6B,CAAC,aAAa,EAAE,CAAC,KAAU,EAAE,EAAE;YACxD,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBACpB,KAAK,GAAG,iCAAyB,CAAC,KAAK,CAAC,CAAC;gBACzC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;aACvB;YACD,IAAI,qBAAa,CAAC,KAAK,CAAC,EAAE;gBACtB,4BAA4B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;aACtD;iBAAM,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBAC3B,gCAAgC,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;aAC1D;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,aAAa,CAAC;SACxB;QAED,OAAO,gBAAC,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE;YAC5C,MAAM,EAAE,gBAAC,CAAC,OAAO,CAAC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,mCAAI,EAAE,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,mCAAI,EAAE,EAAE,MAAM,CAAC;SACpF,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,6BAA6B,CAAC,MAAW,EAAE,cAAwB;;IACxE,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;QAChD,OAAO;YACH,MAAM;YACN,MAAM,EAAE,EAAE;SACb,CAAC;KACL;IAED,MAAM,cAAc,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,mCAAI,EAAE,CAAC;IAC5C,MAAM,MAAM,GAA4B,EAAE,CAAC;IAE3C,MAAM,MAAM,GAAG,gBAAC,CAAC,MAAM,CACnB,cAAc,EACd,CAAC,QAAmC,EAAE,aAAa,EAAE,EAAE;QACnD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,aAAa,CAAC;QACxC,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,CAAC,EACD,EAAE,CACL,CAAC;IAEF,gBAAC,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,aAAkB,EAAE,SAAc,EAAE,EAAE;;QAC7D,IAAI,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,aAAa,EAAE;YAChB,OAAO;SACV;QAED,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAA,aAAa,CAAC,IAAI,mCAAI,QAAQ,CAAC;QACxI,MAAM,OAAO,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,mCAAI,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAElF,aAAa,GAAG,MAAM,CAAC,MAAM,CACzB,EAAE,EACF,aAAa,EACb,gBAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,EACrI,iBAAS,CAAC;YACN,IAAI,EAAE,SAAS;YACf,OAAO;SACV,CAAC,CACL,CAAC;QAEF,aAAa,GAAG,iCAAyB,CAAC,aAAsB,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE;YAC9F,MAAM,aAAa,GAAG,oCAA4B,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YAChF,IAAI,CAAC,aAAa,EAAE;gBAChB,OAAO,aAAa,CAAC;aACxB;YAED,IAAI,QAAQ,GAAG,EAAE,CAAC;YAClB,IAAI,aAAa,CAAC,IAAI,KAAK,MAAM,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE;gBACjE,QAAQ,GAAG,aAAa,CAAC;aAC5B;iBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC1E,QAAQ,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;aAChC;iBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,MAAM,EAAE;gBACtC,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aACjD;iBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxC,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;aAC/E;iBAAM,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxC,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;aAChF;YAED,OAAO,MAAM,CAAC,MAAM,CAChB,EAAE,EACF,aAAa,EACb,gBAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,EAC7H,QAAQ,CACX,CAAC;QACN,CAAC,CAAc,CAAC;QAEhB,MAAM,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,MAAM,EAAE;YACJ,GAAG,MAAM;YACT,MAAM,EAAE,MAAM;SACjB;QACD,MAAM,EAAE,MAAM;KACjB,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,MAAW;IAChC,MAAM,aAAa,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;IAC7D,MAAM,mBAAmB,GAAG,MAAM,CAAC,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC/C,MAAM,gBAAgB,GAAG,GAAG,CAAC,CAAC,CAAC,gBAAM,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACvE,MAAM,MAAM,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEhC,gBAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QACnC,IAAI,CAAC,KAAK,EAAE;YACR,OAAO;SACV;QAED,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;YACvB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;SACzB;QAED,6BAA6B;QAC7B,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;YACxB,KAAK,CAAC,KAAK,GAAG,gBAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;SACxC;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACxD,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;SACrB;QAED,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;YACpB,6CAA6C;YAC7C,cAAM,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;YAEpC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAEzB,IAAI,MAAM,EAAE;gBACR,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAClC,uBAAuB,CAAC,KAAK,CAAC,CAAC;aAClC;SACJ;aAAM,IAAI,mBAAW,CAAC,KAAK,CAAC,IAAI,MAAM,EAAE;YACrC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,IAAI,MAAM,EAAE;YACR,qEAAqE;YACrE,4DAA4D;YAC5D,mFAAmF;YACnF,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBACpB,yBAAyB,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;aAC9D;iBAAM,IAAI,mBAAW,CAAC,KAAK,CAAC,IAAI,CAAC,uBAAe,CAAC,KAAK,CAAC,EAAE;gBACtD,qBAAqB,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;aAC1D;SACJ;QAED,IAAI,uBAAe,CAAC,KAAK,CAAC,EAAE;YACxB,qEAAqE;YACrE,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE;gBAC7B,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;aACxC;YACD,IAAI,yBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAChC,gCAAwB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACzC;SACJ;aAAM,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE;YACpC,gCAAwB,CAAC,KAAK,CAAC,CAAC;SACnC;QAED,qCAA6B,CAAC,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE;YAChD,sCAAsC;YACtC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;gBACxB,KAAK,CAAC,KAAK,GAAG,gBAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACzC;YAED,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBACpB,KAAK,GAAG,iCAAyB,CAAC,KAAK,CAAC,CAAC;gBACzC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;aACvB;YAED,IAAI,qBAAa,CAAC,KAAK,CAAC,EAAE;gBACtB,gCAAwB,CAAC,KAAK,CAAC,CAAC;aACnC;iBAAM,IAAI,0BAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;gBAC1C,gCAAgC;gBAChC,8DAA8D;gBAC9D,uEAAuE;gBACvE,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC5B,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;aACxB;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAChC,gCAAgC;gBAChC,sFAAsF;gBACtF,+EAA+E;gBAC/E,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;gBACrB,KAAK,CAAC,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;aAC7C;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;gBACxD,gCAAgC;gBAChC,uEAAuE;gBACvE,qEAAqE;gBACrE,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO,KAAK,CAAC,KAAK,CAAC;aACtB;YAED,IAAI,gBAAgB,EAAE;gBAClB,0FAA0F;gBAC1F,IAAI,wBAAgB,CAAC,KAAK,CAAC,EAAE;oBACzB,KAAK,GAAI,KAA+B,CAAC;oBACzC,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;oBACrB,KAAK,CAAC,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;iBAC7C;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAgB;IACvC,iCAAiC;IACjC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;QAChB,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;KAC7B;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,KAAgB,EAAE,MAAc;;IACxD,IAAI,QAAQ,CAAC;IACb,IAAI,KAAK,CAAC,QAAQ,EAAE;QAChB,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;KAC7B;SAAM,IAAI,KAAK,CAAC,IAAI,EAAE;QACnB,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;KACzB;SAAM;QACH,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,IAAI,OAAO,KAAK,GAAG,EAAE;YACjB,QAAQ,GAAG,UAAU,CAAC;SACzB;aAAM,IAAI,gBAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,cAAc,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC/E,QAAQ,GAAG,gDAAgD,CAAC;SAC/D;aAAM;YACH,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;SAC3C;KACJ;IACD,MAAM,SAAS,GAAG,gBAAC,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,EAAE,EAAE,GAAG,CAAC,CAAC;IACrD,KAAK,CAAC,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAgB,EAAE,MAAc;;IACxD,IAAI,QAAQ,CAAC;IACb,IAAI,KAAK,CAAC,QAAQ,EAAE;QAChB,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;KAC7B;SAAM,IAAI,KAAK,CAAC,IAAI,EAAE;QACnB,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;KACzB;SAAM;QACH,MAAM,MAAM,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC;QACnD,QAAQ,GAAG,gBAAC,CAAC,IAAI,CAAC,GAAG,MAAM,cAAc,EAAE,GAAG,CAAC,CAAC;KACnD;IACD,MAAM,SAAS,GAAG,gBAAC,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,EAAE,GAAG,CAAC,CAAC;IACpD,KAAK,CAAC,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAgB;IAC7C,IAAI,KAAK,CAAC,WAAW,EAAE;QACnB,OAAO;KACV;IACD,MAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACxF,IAAI,kBAAkB,EAAE;QACpB,OAAO;KACV;IACD,cAAM,CAAC,KAAK,EAAE,QAAQ,EAAE;QACpB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,cAAc;KAC9B,CAAC,CAAC;AACP,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAU,EAAE,aAAkB,EAAE,SAAiB;IAChF,IAAI,gBAAC,CAAC,YAAY,CAAC,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE;QAC/G,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;KAC5B;IACD,MAAM,WAAW,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC3C,IAAI,CAAC,WAAW,EAAE;QACd,OAAO;KACV;IACD,MAAM,cAAc,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IAC/E,IAAI,cAAc,EAAE;QAChB,OAAO;KACV;IACD,eAAO,CAAC,KAAK,EAAE,QAAQ,EAAE;QACrB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,gBAAC,CAAC,SAAS,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAU,EAAE,aAAqB,EAAE,SAAiB;IAC/E,MAAM,kBAAkB,GAAG,gBAAC,CAAC,IAAI,CAAC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IACnF,IAAI,kBAAkB,EAAE;QACpB,OAAO;KACV;IACD,eAAO,CAAC,KAAK,EAAE,QAAQ,EAAE;QACrB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,aAAa;QACpB,WAAW,EAAE,wBAAwB;QACrC,KAAK,EAAE,SAAS;QAChB,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;AACP,CAAC;AAED,SAAS,4BAA4B,CAAC,YAAsC,EAAE,aAAiC;IAC3G,IAAI,YAAY,CAAC,SAAS,IAAI,aAAa,EAAE;QACzC,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACjD,YAAY,CAAC,SAAS,GAAG,oBAAoB,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;KACvF;AACL,CAAC;AAED,SAAS,gCAAgC,CAAC,SAAoB,EAAE,aAAiC;IAC7F,IAAI,SAAS,CAAC,WAAW,KAAK,YAAY,IAAI,aAAa,EAAE;QACzD,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACjD,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;YACpC,IAAI,MAAM,CAAC,SAAS,EAAE;gBAClB,MAAM,CAAC,SAAS,GAAG,oBAAoB,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;aAC3E;QACL,CAAC,CAAC,CAAC;KACN;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,SAAiB,EAAE,YAAoB;IACjE,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7D,OAAO,SAAS,CAAC;KACpB;IACD,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC3B,IAAI,YAAY,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE;YACtD,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;SACxD;aAAM;YACH,YAAY,GAAG,EAAE,CAAC;SACrB;QACD,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,KAAU;;IACvC,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;QACpB,KAAK,GAAG,yBAAiB,CAAC,KAAK,CAAC,CAAC;KACpC;IACD,gHAAgH;IAChH,wEAAwE;IACxE,qCAAqC;IACrC,kFAAkF;IAClF,IAAI,oBAAoB,GAAa,EAAE,CAAC;IACxC,IAAI,oBAAY,CAAC,KAAK,CAAC,IAAI,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,IAAG,CAAC,EAAE;QACjD,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAChC,oBAAoB,GAAG,gBAAC,CAAC,KAAK,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;KACpE;SAAM,IAAI,wBAAgB,CAAC,KAAK,CAAC,IAAI,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC5D,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAChC,oBAAoB,GAAG,gBAAC,CAAC,KAAK,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;KACpE;IACD,OAAO,oBAAoB,CAAC;AAChC,CAAC;AAED,SAAS,8BAA8B,CAAC,MAAW;;IAC/C,MAAM,aAAa,GAAG,MAAA,MAAM,CAAC,aAAa,mCAAI,EAAE,CAAC;IACjD,MAAM,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC;IAEnC,MAAM,cAAc,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,kBAAkB,GAAG,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEpD,IAAI,cAAc,IAAI,kBAAkB,EAAE;QACtC,OAAO;YACH,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,EAAE;SACb,CAAC;KACL;IAED,MAAM,gBAAgB,GAAG,wCAAqB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAEtE,IAAI,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,OAAO;YACH,KAAK,EAAE,gBAAgB,CAAC,KAAK;YAC7B,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,gBAAgB,CAAC,MAAM;SAClC,CAAC;KACL;IAED,MAAM,cAAc,GAAG,gBAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5D,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE;YACjF,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,GAAG,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;gBAClD,GAAG,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;aAC3B,CAAC;SACL;aAAM,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE;YACzF,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,GAAG,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;gBAClD,GAAG,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;aAC3B,CAAC;SACL;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,KAAK,EAAE;YACH,GAAG,MAAM;YACT,MAAM,EAAE,cAAc;SACzB;QACD,MAAM,EAAE,gBAAgB,CAAC,MAAM;KAClC,CAAC;AACN,CAAC;AAED,SAAS,yBAAyB,CAAC,gBAAwC;IACvE,gBAAgB,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;IAChE,6BAA6B,CAAC,gBAAgB,CAAC,CAAC;IAChD,OAAO,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,0BAA0B,CAAC,gBAAwC;IACxE,oDAAoD;IACpD,OAAO;QACH,GAAG,gBAAgB;QACnB,KAAK,EAAE,gBAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAClC,iBAAiB;YACjB,SAAS;YACT,YAAY;YACZ,SAAS;YACT,QAAQ;YACR,cAAc;YACd,YAAY;YACZ,aAAa;YACb,YAAY;YACZ,WAAW;YACX,WAAW;YACX,QAAQ;YACR,UAAU;YACV,SAAS;YACT,eAAe;YACf,eAAe;YACf,sBAAsB;YACtB,cAAc;YACd,aAAa;YACb,eAAe;YACf,cAAc;YACd,QAAQ;YACR,SAAS;SACZ,CAAC;KACL,CAAC;AACN,CAAC;AAED,SAAS,6BAA6B,CAAC,gBAAwC;;IAC3E,MAAM,MAAM,GAAG,MAAA,MAAA,gBAAgB,CAAC,KAAK,0CAAE,MAAM,mCAAI,EAAE,CAAC;IAEpD,MAAM,QAAQ,GAAG,gBAAC,CAAC,MAAM,CACrB,MAAM,EACN,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACf,OAAO,QAAQ,CAAC;SACnB;QACD,MAAM,GAAG,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,MAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC;QACzE,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;YAClC,cAAM,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,MAAM,CAAC;QACpB,OAAO,QAAQ,CAAC;IACpB,CAAC,EACD,EAA4E,CAC/E,CAAC;IAEF,2CAA2C;IAC3C,gBAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1B,gBAAC,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;YACjC,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,gBAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,gBAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QACxB,qCAA6B,CAAC,KAAK,EAAE,CAAC,KAAU,EAAE,EAAE;YAChD,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBACpB,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;aACvB;YACD,IAAI,KAAK,CAAC,MAAM,EAAE;gBACd,IAAI,GAAG,GAAkB,IAAI,CAAC;gBAC9B,IAAI,oBAAY,CAAC,KAAK,CAAC,EAAE;oBACrB,GAAG,GAAG,cAAc,CAAC;iBACxB;qBAAM,IAAI,wBAAgB,CAAC,KAAK,CAAC,EAAE;oBAChC,GAAG,GAAG,gBAAgB,CAAC;iBAC1B;gBACD,IAAI,GAAG,EAAE;oBACL,KAAK,CAAC,MAAM,GAAG,gBAAC,CAAC,MAAM,CACnB,KAAK,CAAC,MAAM,EACZ,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE;wBACtB,MAAM,gBAAgB,GAAG,gBAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC/D,OAAO,gBAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;oBACvD,CAAC,EACD,KAAK,CAAC,MAAM,IAAI,EAAE,CACrB,CAAC;iBACL;gBACD,OAAO,KAAK,CAAC,MAAM,CAAC;aACvB;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,oBAAoB,CAAC,gBAAwC;;IAClE,MAAM,MAAM,GAAG,gBAAgB,CAAC,KAAK,CAAC;IAEtC,kFAAkF;IAClF,4EAA4E;IAC5E,aAAa;IACb,MAAM,QAAQ,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC;IACrC,MAAM,UAAU,GAAY,gBAAC,CAAC,GAAG,CAC7B,QAAQ,EACR,CAAC,SAAoB,EAAE,SAAiB,EAAS,EAAE;QAC/C,OAAO;YACH,IAAI,EAAE,SAAS;YACf,GAAG,SAAS;SACf,CAAC;IACN,CAAC,CACJ,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACnB,aAAa,CAAC,UAAU,CAAC,CAAC;KAC7B;IAED,MAAM,eAAe,GAAG,gBAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,KAA4B,EAAE,EAAE;QACpF,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE;YAC1E,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,UAAU,GAAG,gBAAC,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YAC9C,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC;YAC9B,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;SACvC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,KAAK,EAAE,gBAAgB,CAAC,KAAK;QAC7B,MAAM,EAAE;YACJ,GAAG,MAAM;YACT,MAAM,EAAE,UAAU;SACrB;QACD,MAAM,EAAE,eAAe;KAC1B,CAAC;AACN,CAAC;AAED,SAAS,aAAa,CAAC,MAAe;IAClC,MAAM,CAAC,IAAI,CAAC;QACR,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,OAAO;QACd,UAAU,EAAE,OAAO;QACnB,MAAM,EAAE;YACJ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;YACjC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;SAClC;KACJ,CAAC,CAAC;AACP,CAAC;AAED,SAAS,QAAQ,CAAC,MAAW;IACzB,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC;AACvD,CAAC"}

package/dist/consts.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 export declare const MARKDOWN_FILE_EXTENSIONS: string[];
 export declare const DATA_FILE_EXTENSIONS: string[];
+export declare const SUPPORTED_FILE_EXTENSIONS: string[];
 export declare const EXCLUDED_MARKDOWN_FILES: string[];
 export declare const EXCLUDED_DATA_FILES: string[];
 export declare const EXCLUDED_COMMON_FILES: string[];

package/dist/consts.js CHANGED Viewed

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EXCLUDED_COMMON_FILES = exports.EXCLUDED_DATA_FILES = exports.EXCLUDED_MARKDOWN_FILES = exports.DATA_FILE_EXTENSIONS = exports.MARKDOWN_FILE_EXTENSIONS = void 0;
+exports.EXCLUDED_COMMON_FILES = exports.EXCLUDED_DATA_FILES = exports.EXCLUDED_MARKDOWN_FILES = exports.SUPPORTED_FILE_EXTENSIONS = exports.DATA_FILE_EXTENSIONS = exports.MARKDOWN_FILE_EXTENSIONS = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const excludedMarkdownFiles = ['LICENSE.md', '**/README.md', 'README.theme.md', 'CONTRIBUTING.md', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md'];
 exports.MARKDOWN_FILE_EXTENSIONS = ['md', 'mdx', 'markdown'];
 exports.DATA_FILE_EXTENSIONS = ['yml', 'yaml', 'json', 'toml'];
+exports.SUPPORTED_FILE_EXTENSIONS = [...exports.MARKDOWN_FILE_EXTENSIONS, ...exports.DATA_FILE_EXTENSIONS];
 exports.EXCLUDED_MARKDOWN_FILES = lodash_1.default.concat(excludedMarkdownFiles, excludedMarkdownFiles.map(lodash_1.default.toLower));
 exports.EXCLUDED_DATA_FILES = ['stackbit.yaml', 'netlify.toml', 'theme.toml', '**/package.json', '**/package-lock.json', '**/yarn-lock.json'];
 exports.EXCLUDED_COMMON_FILES = ['**/node_modules/**', '**/.git/**', '.idea/**', '**/.*'];

package/dist/consts.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAM,qBAAqB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,CAAC,CAAC;AAE5H,QAAA,wBAAwB,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AACrD,QAAA,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,uBAAuB,GAAG,gBAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAChG,QAAA,mBAAmB,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,CAAC,CAAC;AACtI,QAAA,qBAAqB,GAAG,CAAC,oBAAoB,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC"}
1	+ {"version":3,"file":"consts.js","sourceRoot":"","sources":["../src/consts.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,MAAM,qBAAqB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,cAAc,EAAE,oBAAoB,CAAC,CAAC;AAE5H,QAAA,wBAAwB,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;AACrD,QAAA,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,yBAAyB,GAAG,CAAC,GAAG,gCAAwB,EAAE,GAAG,4BAAoB,CAAC,CAAC;AACnF,QAAA,uBAAuB,GAAG,gBAAC,CAAC,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,GAAG,CAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAChG,QAAA,mBAAmB,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,mBAAmB,CAAC,CAAC;AACtI,QAAA,qBAAqB,GAAG,CAAC,oBAAoB,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC"}

package/dist/content/content-loader.js CHANGED Viewed

@@ -116,7 +116,7 @@ async function loadPageFiles({ dirPath, config, skipUnmodeledContent }) {
     }
     let filePaths;
     try {
-        filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, consts_1.MARKDOWN_FILE_EXTENSIONS);
+        filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, consts_1.SUPPORTED_FILE_EXTENSIONS);
     }
     catch (error) {
         return {

package/dist/content/content-loader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"content-loader.js","sourceRoot":"","sources":["../../src/content/content-loader.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"content-loader.js","sourceRoot":"","sources":["../../src/content/content-loader.ts"],"names":[],"mappings":"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"}

package/dist/content/content-validator.js CHANGED Viewed

@@ -13,8 +13,8 @@ function validateContentItems({ contentItems, config }) {
     const errors = [];
     const joiModelSchemas = content_schema_1.joiSchemasForModels(config);
     const value = lodash_1.default.map(contentItems, (contentItem) => {
-        var _a;
-        const modelName = contentItem.__metadata.modelName;
+        var _a, _b;
+        const modelName = (_a = contentItem.__metadata) === null || _a === void 0 ? void 0 : _a.modelName;
         if (!modelName) {
             return contentItem;
         }
@@ -44,8 +44,8 @@ function validateContentItems({ contentItems, config }) {
                     modelSchema = modelSchema.keys({ [pageLayoutKey]: joi_1.default.string().valid(model.layout) });
                 }
             }
-            else if (utils_1.isDataModel(model)) {
-                const objectTypeKey = config.objectTypeKey || 'layout';
+            else if (utils_1.isDataModel(model) && !utils_1.isListDataModel(model)) {
+                const objectTypeKey = config.objectTypeKey || 'type';
                 if (!lodash_1.default.find(model.fields, { name: objectTypeKey })) {
                     modelSchema = modelSchema.keys({ [objectTypeKey]: joi_1.default.string().valid(model.name) });
                 }
@@ -58,7 +58,7 @@ function validateContentItems({ contentItems, config }) {
             });
         }
         const validationResult = modelSchema.validate(contentItem, validationOptions);
-        const validationErrors = (_a = validationResult.error) === null || _a === void 0 ? void 0 : _a.details.map((validationError) => {
+        const validationErrors = (_b = validationResult.error) === null || _b === void 0 ? void 0 : _b.details.map((validationError) => {
             var _a;
             return new content_errors_1.ContentValidationError({
                 type: validationError.type,

package/dist/content/content-validator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"content-validator.js","sourceRoot":"","sources":["../../src/content/content-validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,oDAAuB;AAGvB,qDAAuD;AACvD,qDAA0D;AAC1D,~~oCAAmF~~;~~AAcnF~~,SAAgB,oBAAoB,CAAC,EAAE,YAAY,EAAE,MAAM,EAA4B;IACnF,MAAM,MAAM,GAA6B,EAAE,CAAC;IAE5C,MAAM,eAAe,GAAG,oCAAmB,CAAC,MAAM,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,gBAAC,CAAC,GAAG,CACf,YAAY,EACZ,CAAC,WAAW,EAAe,EAAE;;QACzB,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,~~CAAC~~,SAAS,CAAC;~~QACnD~~,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,WAAW,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,WAAW,CAAC;SACtB;QACD,MAAM,iBAAiB,GAAG;YACtB,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE;gBACL,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,QAAQ;aAC5C;SACJ,CAAC;QAEF,MAAM,KAAK,GAAG,sBAAc,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,KAAK,EAAE;YACP,IAAI,qBAAa,CAAC,KAAK,CAAC,EAAE;gBACtB,IAAI,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE;oBAC7B,0DAA0D;oBAC1D,WAAW,GAAG,aAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;iBACrD;gBACD,0CAA0C;gBAC1C,WAAW,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;aACvC;iBAAM,IAAI,mBAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;gBAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,QAAQ,CAAC;gBACvD,IAAI,CAAC,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE;oBAChD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;iBACzF;aACJ;iBAAM,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;~~gBAC3B~~,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,~~QAAQ~~,CAAC;~~gBACvD~~,IAAI,CAAC,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE;oBAChD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACvF;aACJ;YACD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;gBAC3B,UAAU,EAAE,aAAG,CAAC,MAAM,CAAC;oBACnB,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;oBACjC,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;iBACvD,CAAC,CAAC,QAAQ,EAAE;aAChB,CAAC,CAAC;SACN;QAED,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAC9E,MAAM,gBAAgB,GAAG,MAAA,gBAAgB,CAAC,KAAK,0CAAE,OAAO,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE;;YAC7E,OAAO,IAAI,uCAAsB,CAAC;gBAC9B,IAAI,EAAE,eAAe,CAAC,IAAI;gBAC1B,OAAO,EAAE,eAAe,CAAC,OAAO;gBAChC,SAAS,EAAE,eAAe,CAAC,IAAI;gBAC/B,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,MAAA,eAAe,CAAC,OAAO,0CAAE,KAAK;gBACrC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,QAAQ;aAC5C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,IAAI,gBAAgB,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;SACpC;QACD,OAAO,gBAAgB,CAAC,KAAK,CAAC;IAClC,CAAC,CACJ,CAAC;IACF,MAAM,KAAK,GAAG,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO;QACH,KAAK;QACL,KAAK;QACL,MAAM;KACT,CAAC;AACN,CAAC;AA1ED,oDA0EC"}
1	+ {"version":3,"file":"content-validator.js","sourceRoot":"","sources":["../../src/content/content-validator.ts"],"names":[],"mappings":"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"}

package/dist/utils/model-matcher.js CHANGED Viewed

@@ -61,7 +61,7 @@ function getModelsByQuery(query, models) {
             modelGroups.byFile.push(model);
         }
         else if (objectType && lodash_1.default.has(model, modelTypeKeyPath)) {
-            modelGroups.byLayout.push(model);
+            modelGroups.byType.push(model);
         }
         else {
             modelGroups.byGlob.push(model);
@@ -69,7 +69,7 @@ function getModelsByQuery(query, models) {
         return modelGroups;
     }, {
         byFile: [],
-        byLayout: [],
+        byType: [],
         byGlob: []
     });
     const fileMatchedModels = lodash_1.default.filter(modelMatchGroups.byFile, (model) => {
@@ -86,12 +86,12 @@ function getModelsByQuery(query, models) {
     if (!lodash_1.default.isEmpty(fileMatchedModels)) {
         return fileMatchedModels;
     }
-    const layoutMatchedModels = lodash_1.default.filter(modelMatchGroups.byLayout, (model) => {
+    const typeMatchedModels = lodash_1.default.filter(modelMatchGroups.byType, (model) => {
         const modelType = lodash_1.default.get(model, modelTypeKeyPath);
         return objectType === modelType;
     });
-    if (!lodash_1.default.isEmpty(layoutMatchedModels)) {
-        return layoutMatchedModels;
+    if (!lodash_1.default.isEmpty(typeMatchedModels)) {
+        return typeMatchedModels;
     }
     return lodash_1.default.filter(modelMatchGroups.byGlob, (model) => {
         const folder = lodash_1.default.get(model, 'folder', '');

package/dist/utils/model-matcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"model-matcher.js","sourceRoot":"","sources":["../../src/utils/model-matcher.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,oDAAuB;AAEvB,8DAAqG;AAcrG;;;;;;;;;;;GAWG;AACH,SAAgB,eAAe,CAAC,KAAiB,EAAE,MAAe;IAC9D,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,yCAAwB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;KACvF;SAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,+CAA8B,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAC,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;KACvI;IACD,OAAO,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACrD,CAAC;AATD,0CASC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,gBAAgB,CAAC,KAAiB,EAAE,MAAe;IAC/D,MAAM,QAAQ,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,gBAAgB,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAG,gBAAC,CAAC,MAAM,CAC7B,MAAM,EACN,CACI,WAIC,EACD,KAAK,EACP,EAAE;QACA,IAAI,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;YACtB,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAClC;aAAM,IAAI,UAAU,IAAI,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,CAAC,EAAE;YACrD,WAAW,CAAC,~~QAAQ~~,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;~~SACpC~~;aAAM;YACH,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAClC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EACD;QACI,MAAM,EAAE,EAAE;QACV,~~QAAQ~~,EAAE,EAAE;~~QACZ~~,MAAM,EAAE,EAAE;KACb,CACJ,CAAC;IAEF,MAAM,iBAAiB,GAAG,gBAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAClE,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACzB,OAAO,KAAK,CAAC;SAChB;QACD,IAAI;YACA,OAAO,oBAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SACnD;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;QAC/B,OAAO,iBAAiB,CAAC;KAC5B;IAED,MAAM,~~mBAAmB~~,GAAG,gBAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,~~QAAQ~~,EAAE,CAAC,KAAK,EAAE,EAAE;~~QACtE~~,MAAM,SAAS,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;QACjD,OAAO,UAAU,KAAK,SAAS,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,~~mBAAmB~~,CAAC,EAAE;~~QACjC~~,OAAO,~~mBAAmB~~,CAAC;~~KAC9B~~;IAED,OAAO,gBAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,KAAK,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAC1C,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC3C,OAAO,oBAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IACjH,CAAC,CAAC,CAAC;AACP,CAAC;AA/DD,4CA+DC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,IAAuB;IAC7D,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,gBAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,WAAW,CAAC,IAAuB;IACxC,OAAO,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC;SACf,SAAS,EAAE;SACX,OAAO,EAAE;SACT,MAAM,CAAC,CAAC,KAAe,EAAE,QAAQ,EAAE,EAAE;QAClC,MAAM,SAAS,GAAG,gBAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC;QAC5E,OAAO,gBAAC,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC;SACL,KAAK,EAAE,CAAC;AACjB,CAAC"}
1	+ {"version":3,"file":"model-matcher.js","sourceRoot":"","sources":["../../src/utils/model-matcher.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@stackbit/sdk",
-    "version": "0.2.27",
+    "version": "0.2.30",
     "description": "Stackbit SDK",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -37,7 +37,7 @@
     "homepage": "https://github.com/stackbit/stackbit-sdk#readme",
     "dependencies": {
         "@octokit/rest": "^18.3.5",
-        "@stackbit/utils": "^0.2.2",
+        "@stackbit/utils": "^0.2.3",
         "acorn": "^8.2.4",
         "fs-extra": "^9.1.0",
         "joi": "^17.4.0",
@@ -63,5 +63,6 @@
         "prettier": "2.2.1",
         "ts-jest": "^26.5.1",
         "typescript": "^4.2.2"
-    }
+    },
+    "gitHead": "55b8da185499b8c6e00ce79b9a93fee8f9781dce"
 }

package/src/config/config-loader.ts CHANGED Viewed

@@ -25,7 +25,7 @@ import {
     normalizeListFieldInPlace,
     getModelFieldForModelKeyPath
 } from '../utils';
-import { append, omitByNil, parseFile, readDirRecursively, reducePromise, rename } from '@stackbit/utils';
+import { append, prepend, omitByNil, parseFile, readDirRecursively, reducePromise, rename } from '@stackbit/utils';
 import { Config, DataModel, FieldEnum, FieldModel, FieldObjectProps, Model, ModelsSource, PageModel, YamlModel } from './config-types';
 import { loadPresets } from './presets-loader';
@@ -125,7 +125,7 @@ async function loadConfigFromDir(dirPath: string): Promise<TempConfigLoaderResul
             },
             errors: fileModelsErrors
         };
-    } catch (error) {
+    } catch (error: any) {
         return {
             errors: [new ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
         };
@@ -236,7 +236,7 @@ async function loadModelsFromExternalSource(
                 models: models,
                 errors: []
             };
-        } catch (error) {
+        } catch (error: any) {
             return {
                 models: [],
                 errors: [new ConfigLoadError(`Error fetching and converting Contentful schema, error: ${error.message}`, { originalError: error })]
@@ -351,28 +351,28 @@ function mergeConfigWithExternalModels(config: any, externalModels?: Model[]): {
             })
         );
-        externalModel = mapModelFieldsRecursively(externalModel as Model, (field, modelKeyPath) => {
+        externalModel = mapModelFieldsRecursively(externalModel as Model, (externalField, modelKeyPath) => {
             const stackbitField = getModelFieldForModelKeyPath(stackbitModel, modelKeyPath);
             if (!stackbitField) {
-                return field;
+                return externalField;
             }
             let override = {};
-            if (stackbitField.type === 'style') {
+            if (externalField.type === 'json' && stackbitField.type === 'style') {
                 override = stackbitField;
-            } else if (field.type === 'enum') {
-                override = _.pick(stackbitField, ['options']);
-            } else if (field.type === 'color') {
+            } else if (externalField.type === 'string' && stackbitField.type === 'color') {
                 override = { type: 'color' };
-            } else if (field.type === 'number') {
+            } else if (externalField.type === 'enum') {
+                override = _.pick(stackbitField, ['options']);
+            } else if (externalField.type === 'number') {
                 override = _.pick(stackbitField, ['subtype', 'min', 'max', 'step', 'unit']);
-            } else if (field.type === 'object') {
+            } else if (externalField.type === 'object') {
                 override = _.pick(stackbitField, ['labelField', 'thumbnail', 'fieldGroups']);
             }
             return Object.assign(
                 {},
-                field,
+                externalField,
                 _.pick(stackbitField, ['label', 'description', 'required', 'default', 'group', 'const', 'hidden', 'readOnly', 'controlType']),
                 override
             );
@@ -398,7 +398,6 @@ function normalizeConfig(config: any): any {
     const isStackbitYamlV2 = ver ? semver.satisfies(ver, '<0.3.0') : false;
     const models = config?.models || {};
     const gitCMS = isGitCMS(config);
-    let referencedModelNames: string[] = [];
     _.forEach(models, (model, modelName) => {
         if (!model) {
@@ -427,14 +426,22 @@ function normalizeConfig(config: any): any {
             if (gitCMS) {
                 updatePageFilePath(model, config);
                 addMarkdownContentField(model);
-                // TODO: update schema-editor to not show layout field
-                addLayoutFieldToPageModel(model, pageLayoutKey);
             }
         } else if (isDataModel(model) && gitCMS) {
             updateDataFilePath(model, config);
         }
+        if (gitCMS) {
+            // TODO: do not add pageLayoutKey and objectTypeKey fields to models,
+            //  The content validator should always assume these fields.
+            //  And when new objects created from UI, it should add these fields automatically.
+            if (isPageModel(model)) {
+                addLayoutFieldToPageModel(model, pageLayoutKey, modelName);
+            } else if (isDataModel(model) && !isListDataModel(model)) {
+                addObjectTypeKeyField(model, objectTypeKey, modelName);
+            }
+        }
         if (isListDataModel(model)) {
             // 'items.type' of list model defaults to 'string', set it explicitly
             if (!_.has(model, 'items.type')) {
@@ -488,26 +495,9 @@ function normalizeConfig(config: any): any {
                     field.models = _.get(field, 'models', []);
                 }
             }
-            if (gitCMS) {
-                referencedModelNames = _.union(referencedModelNames, getReferencedModelNames(field));
-            }
         });
     });
-    _.forEach(referencedModelNames, (modelName) => {
-        const model = models[modelName];
-        // don't add objectTypeKey to page models, they have pageLayoutKey
-        if (!model || model.type === 'page') {
-            return;
-        }
-        // TODO: update schema-editor to not show type field
-        // TODO: do not add objectTypeKey field to models, API/container should
-        //  be able to add it automatically when data object or polymorphic nested model is added
-        addObjectTypeKeyField(model, objectTypeKey, modelName);
-    });
     return config;
 }
@@ -574,7 +564,10 @@ function addMarkdownContentField(model: PageModel) {
     });
 }
-function addLayoutFieldToPageModel(model: any, pageLayoutKey: any) {
+function addLayoutFieldToPageModel(model: any, pageLayoutKey: any, modelName: string) {
+    if (_.intersection(_.keys(model), ['file', 'folder', 'match', 'exclude']).length === 0 && !_.get(model, 'layout')) {
+        model.layout = modelName;
+    }
     const modelLayout = _.get(model, 'layout');
     if (!modelLayout) {
         return;
@@ -583,7 +576,7 @@ function addLayoutFieldToPageModel(model: any, pageLayoutKey: any) {
     if (hasLayoutField) {
         return;
     }
-    append(model, 'fields', {
+    prepend(model, 'fields', {
         type: 'string',
         name: pageLayoutKey,
         label: _.startCase(pageLayoutKey),
@@ -597,7 +590,7 @@ function addObjectTypeKeyField(model: any, objectTypeKey: string, modelName: str
     if (hasObjectTypeField) {
         return;
     }
-    append(model, 'fields', {
+    prepend(model, 'fields', {
         type: 'string',
         name: objectTypeKey,
         label: 'Object Type',

package/src/consts.ts CHANGED Viewed

@@ -4,6 +4,7 @@ const excludedMarkdownFiles = ['LICENSE.md', '**/README.md', 'README.theme.md',
 export const MARKDOWN_FILE_EXTENSIONS = ['md', 'mdx', 'markdown'];
 export const DATA_FILE_EXTENSIONS = ['yml', 'yaml', 'json', 'toml'];
+export const SUPPORTED_FILE_EXTENSIONS = [...MARKDOWN_FILE_EXTENSIONS, ...DATA_FILE_EXTENSIONS];
 export const EXCLUDED_MARKDOWN_FILES = _.concat(excludedMarkdownFiles, excludedMarkdownFiles.map(_.toLower));
 export const EXCLUDED_DATA_FILES = ['stackbit.yaml', 'netlify.toml', 'theme.toml', '**/package.json', '**/package-lock.json', '**/yarn-lock.json'];
 export const EXCLUDED_COMMON_FILES = ['**/node_modules/**', '**/.git/**', '.idea/**', '**/.*'];

package/src/content/content-loader.ts CHANGED Viewed

@@ -18,7 +18,14 @@ import {
     getModelOfObject
 } from '../utils';
 import { validateContentItems } from './content-validator';
-import { DATA_FILE_EXTENSIONS, EXCLUDED_DATA_FILES, EXCLUDED_MARKDOWN_FILES, EXCLUDED_COMMON_FILES, MARKDOWN_FILE_EXTENSIONS } from '../consts';
+import {
+    DATA_FILE_EXTENSIONS,
+    EXCLUDED_DATA_FILES,
+    EXCLUDED_MARKDOWN_FILES,
+    EXCLUDED_COMMON_FILES,
+    MARKDOWN_FILE_EXTENSIONS,
+    SUPPORTED_FILE_EXTENSIONS
+} from '../consts';
 import { Config, ConfigModel, Field, FieldListItems, FieldModelProps, Model } from '../config/config-types';
 interface BaseMetadata {
@@ -132,7 +139,7 @@ async function loadDataFiles({ dirPath, config, skipUnmodeledContent }: ContentL
     let filePaths;
     try {
         filePaths = await readDirRecursivelyWithFilter(absDataDirPath, excludedFiles, DATA_FILE_EXTENSIONS);
-    } catch (error) {
+    } catch (error: any) {
         return {
             contentItems,
             errors: errors.concat(new FolderReadError({ folderPath: dataDir, error: error }))
@@ -185,8 +192,8 @@ async function loadPageFiles({ dirPath, config, skipUnmodeledContent }: ContentL
     let filePaths;
     try {
-        filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, MARKDOWN_FILE_EXTENSIONS);
-    } catch (error) {
+        filePaths = await readDirRecursivelyWithFilter(absPagesDirPath, excludedFiles, SUPPORTED_FILE_EXTENSIONS);
+    } catch (error: any) {
         return {
             contentItems,
             errors: errors.concat(new FolderReadError({ folderPath: pagesDir, error: error }))
@@ -237,7 +244,7 @@ async function loadDataItemForConfigModel(dirPath: string, configModel: ConfigMo
         return {
             contentItem: modeledDataItem(filePath, data, configModel, config)
         };
-    } catch (error) {
+    } catch (error: any) {
         return {
             error: new FileReadError({ filePath: filePath, error: error })
         };
@@ -305,7 +312,7 @@ async function loadContentItems({
         let data;
         try {
             data = await loadFile(absFilePath, fileIsInProjectDir);
-        } catch (error) {
+        } catch (error: any) {
             errors.push(new FileReadError({ filePath: filePathRelativeToProject, error: error }));
             return;
         }

package/src/content/content-validator.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import _ from 'lodash';
 import { ContentItem } from './content-loader';
 import { joiSchemasForModels } from './content-schema';
 import { ContentValidationError } from './content-errors';
-import { getModelByName, isConfigModel, isDataModel, isPageModel } from '../utils';
+import { getModelByName, isConfigModel, isDataModel, isListDataModel, isPageModel } from '../utils';
 import { Config } from '../config/config-types';
 interface ContentValidationOptions {
@@ -26,7 +26,7 @@ export function validateContentItems({ contentItems, config }: ContentValidation
     const value = _.map(
         contentItems,
         (contentItem): ContentItem => {
-            const modelName = contentItem.__metadata.modelName;
+            const modelName = contentItem.__metadata?.modelName;
             if (!modelName) {
                 return contentItem;
             }
@@ -55,8 +55,8 @@ export function validateContentItems({ contentItems, config }: ContentValidation
                     if (!_.find(model.fields, { name: pageLayoutKey })) {
                         modelSchema = modelSchema.keys({ [pageLayoutKey]: Joi.string().valid(model.layout) });
                     }
-                } else if (isDataModel(model)) {
-                    const objectTypeKey = config.objectTypeKey || 'layout';
+                } else if (isDataModel(model) && !isListDataModel(model)) {
+                    const objectTypeKey = config.objectTypeKey || 'type';
                     if (!_.find(model.fields, { name: objectTypeKey })) {
                         modelSchema = modelSchema.keys({ [objectTypeKey]: Joi.string().valid(model.name) });
                     }

package/src/utils/model-matcher.ts CHANGED Viewed

@@ -69,7 +69,7 @@ export function getModelsByQuery(query: ModelQuery, models: Model[]): Model[] {
         (
             modelGroups: {
                 byFile: Model[];
-                byLayout: Model[];
+                byType: Model[];
                 byGlob: Model[];
             },
             model
@@ -77,7 +77,7 @@ export function getModelsByQuery(query: ModelQuery, models: Model[]): Model[] {
             if (_.has(model, 'file')) {
                 modelGroups.byFile.push(model);
             } else if (objectType && _.has(model, modelTypeKeyPath)) {
-                modelGroups.byLayout.push(model);
+                modelGroups.byType.push(model);
             } else {
                 modelGroups.byGlob.push(model);
             }
@@ -85,7 +85,7 @@ export function getModelsByQuery(query: ModelQuery, models: Model[]): Model[] {
         },
         {
             byFile: [],
-            byLayout: [],
+            byType: [],
             byGlob: []
         }
     );
@@ -105,13 +105,13 @@ export function getModelsByQuery(query: ModelQuery, models: Model[]): Model[] {
         return fileMatchedModels;
     }
-    const layoutMatchedModels = _.filter(modelMatchGroups.byLayout, (model) => {
+    const typeMatchedModels = _.filter(modelMatchGroups.byType, (model) => {
         const modelType = _.get(model, modelTypeKeyPath);
         return objectType === modelType;
     });
-    if (!_.isEmpty(layoutMatchedModels)) {
-        return layoutMatchedModels;
+    if (!_.isEmpty(typeMatchedModels)) {
+        return typeMatchedModels;
     }
     return _.filter(modelMatchGroups.byGlob, (model) => {

package/src/.DS_Store DELETED Viewed

Binary file