npm - @stackbit/sdk - Versions diffs - 0.2.5 → 0.2.10 - Mend

@stackbit/sdk 0.2.5 → 0.2.10

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 (12) hide show

package/dist/config/config-loader.js +60 -6
package/dist/config/config-loader.js.map +1 -1
package/dist/content/content-schema.js +25 -13
package/dist/content/content-schema.js.map +1 -1
package/dist/utils/model-extender.d.ts +9 -2
package/dist/utils/model-extender.js +63 -25
package/dist/utils/model-extender.js.map +1 -1
package/package.json +1 -1
package/src/.DS_Store +0 -0
package/src/config/config-loader.ts +61 -7
package/src/content/content-schema.ts +27 -15
package/src/utils/model-extender.ts +85 -33

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

@@ -50,13 +50,14 @@ function validateAndNormalizeConfig(config) {
     // extend config models having the "extends" property
     // this must be done before main config validation as some properties like
     // the labelField will not work when validating models without extending them first
-    config.models = utils_1.extendModelMap((config === null || config === void 0 ? void 0 : config.models) || {});
-    // extend config - backward compatibility updates, adding extra fields like "markdown_content", "type" and "layout",
+    const { models, errors: extendModelErrors } = utils_1.extendModelMap((config === null || config === void 0 ? void 0 : config.models) || {});
+    config.models = models;
+    // normalize config - backward compatibility updates, adding extra fields like "markdown_content", "type" and "layout",
     // and setting other default values.
-    config = extendConfig(config);
+    config = normalizeConfig(config);
     // validate config
     const configValidationResult = config_validator_1.validateConfig(config);
-    const errors = [...contentModelsValidationResult.errors, ...configValidationResult.errors];
+    const errors = [...contentModelsValidationResult.errors, ...extendModelErrors, ...configValidationResult.errors];
     return normalizeValidationResult({
         valid: lodash_1.default.isEmpty(errors),
         value: configValidationResult.value,
@@ -167,7 +168,7 @@ async function loadConfigFromDotStackbit(dirPath) {
     }
     return lodash_1.default.isEmpty(config) ? null : config;
 }
-function extendConfig(config) {
+function normalizeConfig(config) {
     const pageLayoutKey = lodash_1.default.get(config, 'pageLayoutKey', 'layout');
     const objectTypeKey = lodash_1.default.get(config, 'objectTypeKey', 'type');
     const stackbitYamlVersion = String(lodash_1.default.get(config, 'stackbitVersion', ''));
@@ -183,10 +184,15 @@ function extendConfig(config) {
         if (utils_1.isPageModel(model)) {
             // rename old 'template' property to 'layout'
             utils_2.rename(model, 'template', 'layout');
+            updatePageUrlPath(model);
+            updatePageFilePath(model, config);
             addMarkdownContentField(model);
             // TODO: update schema-editor to not show layout field
             addLayoutFieldToPageModel(model, pageLayoutKey);
         }
+        else if (utils_1.isDataModel(model)) {
+            updateDataFilePath(model, config);
+        }
         if (utils_1.isListDataModel(model)) {
             // 'items.type' of list model defaults to 'string', set it explicitly
             if (!lodash_1.default.has(model, 'items.type')) {
@@ -265,6 +271,54 @@ function extendConfig(config) {
     });
     return config;
 }
+function updatePageUrlPath(model) {
+    // set default urlPath if not set
+    if (!model.urlPath) {
+        model.urlPath = '/{slug}';
+    }
+}
+/**
+ * Sets the page model's filePath pattern.
+ * If the model has `filePath` property, it is prefixed with `pagesDir` and returned.
+ * If the model has no `filePath` property, then `filePath` is naively inferred by
+ * prefixing `urlPath` with `pagesDir` and appending the `.md` extension.
+ */
+function updatePageFilePath(model, config) {
+    var _a;
+    // do not define filePath for singleton pages
+    if (model.file) {
+        return;
+    }
+    let filePath = model === null || model === void 0 ? void 0 : model.filePath;
+    if (!filePath) {
+        const urlPath = model.urlPath;
+        if (urlPath === '/') {
+            filePath = 'index.md';
+        }
+        else if (lodash_1.default.trim(urlPath, '/') === 'posts/{slug}' && config.ssgName === 'jekyll') {
+            filePath = '_posts/{moment_format("YYYY-MM-DD")}-{slug}.md';
+        }
+        else {
+            filePath = lodash_1.default.trim(urlPath, '/') + '.md';
+        }
+    }
+    const parentDir = lodash_1.default.trim((_a = config.pagesDir) !== null && _a !== void 0 ? _a : '', '/');
+    model.filePath = path_1.default.join(parentDir, filePath);
+}
+function updateDataFilePath(model, config) {
+    var _a;
+    // do not define filePath for singleton files
+    if (model.file) {
+        return;
+    }
+    let filePath = model === null || model === void 0 ? void 0 : model.filePath;
+    if (!filePath) {
+        const folder = lodash_1.default.trim(lodash_1.default.get(model, 'folder'), '/');
+        filePath = lodash_1.default.trim(`${folder}/{slug}.json`, '/');
+    }
+    const parentDir = lodash_1.default.trim((_a = config.dataDir) !== null && _a !== void 0 ? _a : '', '/');
+    model.filePath = path_1.default.join(parentDir, filePath);
+}
 function addMarkdownContentField(model) {
     if (!model.hideContent) {
         utils_2.append(model, 'fields', {
@@ -399,7 +453,7 @@ function validateAndExtendContentModels(config) {
             return {
                 type: 'data',
                 ...(contentModel.newFilePath ? { filePath: contentModel.newFilePath } : {}),
-                ...lodash_1.default.omit(contentModel, ['newFilePath']),
+                ...lodash_1.default.omit(contentModel, ['isPage', 'newFilePath']),
                 ...lodash_1.default.omit(model, '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":"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"}

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

@@ -275,6 +275,9 @@ function stylePropSizeSchema(styleConfig) {
     // TODO: validate Tailwind paddings
     styleConfig = lodash_1.default.castArray(styleConfig);
     const dirSchemas = lodash_1.default.reduce(styleConfig, (dirSchemas, pattern) => {
+        if (typeof pattern !== 'string') {
+            return dirSchemas;
+        }
         const directionMatch = pattern.match(/^[xylrtb]/);
         const directions = [];
         if (!directionMatch) {
@@ -295,14 +298,17 @@ function stylePropSizeSchema(styleConfig) {
         }
         let valueSchema = joi_1.default.number();
         if (pattern) {
-            const parts = pattern.split(':');
+            const parts = pattern.split(':').map((value) => Number(value));
+            if (lodash_1.default.some(parts, lodash_1.default.isNaN)) {
+                return dirSchemas;
+            }
             if (parts.length === 1) {
-                valueSchema = valueSchema.valid(Number(parts[0]));
+                valueSchema = valueSchema.valid(parts[0]);
             }
             else {
-                valueSchema = valueSchema.min(Number(parts[0])).max(Number(parts[1]));
+                valueSchema = valueSchema.min(parts[0]).max(parts[1]);
                 if (parts.length === 3) {
-                    valueSchema = valueSchema.multiple(Number(parts[3]));
+                    valueSchema = valueSchema.multiple(parts[3]);
                 }
             }
         }
@@ -315,7 +321,7 @@ function stylePropSizeSchema(styleConfig) {
     return joi_1.default.object(objectSchema);
 }
 function stylePropObjectValueSchema(styleConfig) {
-    return joi_1.default.valid(...lodash_1.default.map(styleConfig, (object) => object.value));
+    return joi_1.default.valid(...lodash_1.default.map(styleConfig, (object) => lodash_1.default.get(object, 'value')));
 }
 function stylePropFontWeightSchema(styleConfig) {
     if (styleConfig === '*') {
@@ -332,12 +338,15 @@ function stylePropFontWeightSchema(styleConfig) {
         if (lodash_1.default.isEmpty(value)) {
             return validValues;
         }
-        const parts = value.split(':');
+        const parts = value.split(':').map((value) => Number(value));
+        if (lodash_1.default.some(parts, lodash_1.default.isNaN)) {
+            return validValues;
+        }
         if (parts.length === 1) {
-            return validValues.add(parts[0]);
+            return validValues.add(String(parts[0]));
         }
-        const start = Number(parts[0]);
-        const end = Number(parts[1]);
+        const start = parts[0];
+        const end = parts[1];
         for (let i = start; i <= end; i += 100) {
             validValues.add(String(i));
         }
@@ -360,12 +369,15 @@ function stylePropOpacitySchema(styleConfig) {
         if (lodash_1.default.isEmpty(value)) {
             return validValues;
         }
-        const parts = value.split(':');
+        const parts = value.split(':').map((value) => Number(value));
+        if (lodash_1.default.some(parts, lodash_1.default.isNaN)) {
+            return validValues;
+        }
         if (parts.length === 1) {
-            return validValues.add(Number(parts[0]));
+            return validValues.add(parts[0]);
         }
-        const start = Number(parts[0]);
-        const end = Number(parts[1]);
+        const start = parts[0];
+        const end = parts[1];
         for (let i = start; i <= end; i += 5) {
             validValues.add(i);
         }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"content-schema.js","sourceRoot":"","sources":["../../src/content/content-schema.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"content-schema.js","sourceRoot":"","sources":["../../src/content/content-schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,oDAAuB;AACvB,2CAAyC;AAEzC,2DAA6D;AAC7D,oCAAoD;AAwBpD,MAAM,cAAc,GAAG,aAAG,CAAC,MAAM,CAAC;IAC9B,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IACnC,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE;IACtB,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,MAAM,YAAY,GAAG,gBAAC,CAAC,MAAM,CACzB,MAAM,CAAC,MAAM,EACb,CAAC,YAA4B,EAAE,KAAY,EAAE,EAAE;;QAC3C,IAAI,SAA2B,CAAC;QAChC,IAAI,MAAA,KAAK,CAAC,UAAU,0CAAE,OAAO,EAAE;YAC3B,iHAAiH;YACjH,IAAI,WAAW,GAAG,YAAY,CAAC;YAC/B,IAAI,mBAAW,CAAC,KAAK,CAAC,IAAI,mBAAW,CAAC,KAAK,CAAC,EAAE;gBAC1C,WAAW,GAAG,MAAM,CAAC;aACxB;YACD,SAAS,GAAG,aAAG,CAAC,MAAM,EAAE;iBACnB,SAAS,EAAE;iBACX,QAAQ,CAAC;gBACN,aAAa,EAAE,GAAG,WAAW,oCAAoC,KAAK,CAAC,IAAI,sDAAsD;aACpI,CAAC,CAAC;SACV;aAAM;YACH,SAAS,GAAG,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAChD;QACD,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,eAAe,CAAC,CAAC;QACtE,OAAO,YAAY,CAAC;IACxB,CAAC,EACD,EAAE,CACL,CAAC;IAEF,sGAAsG;IACtG,gDAAgD;IAChD,wEAAwE;IACxE,0DAA0D;IAC1D,0DAA0D;IAC1D,0DAA0D;IAC1D,qGAAqG;IACrG,OAAO,gBAAC,CAAC,MAAM,CACX,YAAY,EACZ,CAAC,KAAqB,EAAE,WAA6B,EAAE,SAAiB,EAAE,EAAE;QACxE,MAAM,iBAAiB,GAAG,gBAAC,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QAC1D,KAAK,CAAC,SAAS,CAAC,GAAG,gBAAC,CAAC,MAAM,CACvB,iBAAiB,EACjB,CAAC,WAA6B,EAAE,gBAAkC,EAAE,EAAE;YAClE,OAAO,WAAW,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChD,CAAC,EACD,WAAW,CACd,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC,EACD,EAAE,CACL,CAAC;AACN,CAAC;AA/CD,kDA+CC;AAED,SAAgB,iBAAiB,CAAC,KAAY,EAAE,MAAc;IAC1D,IAAI,mBAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;QACpC,OAAO,aAAG,CAAC,MAAM,CAAC;YACd,KAAK,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;SAC1F,CAAC,CAAC;KACN;SAAM;QACH,OAAO,uBAAuB,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;KACtE;AACL,CAAC;AARD,8CAQC;AAED,SAAS,uBAAuB,CAAC,MAA2B,EAAE,MAAc,EAAE,SAAoB;IAC9F,OAAO,aAAG,CAAC,MAAM,CACb,gBAAC,CAAC,MAAM,CACJ,MAAM,EACN,CAAC,MAAkC,EAAE,KAAK,EAAE,EAAE;QAC1C,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAClE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC;IAClB,CAAC,EACD,EAAE,CACL,CACJ,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA6B,EAAE,MAAc,EAAE,SAAoB;IAC1F,IAAI,WAAW,CAAC;IAChB,QAAQ,KAAK,CAAC,IAAI,EAAE;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACR,WAAW,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3C,MAAM;QACV,KAAK,SAAS;YACV,WAAW,GAAG,aAAG,CAAC,OAAO,EAAE,CAAC;YAC5B,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,UAAU;YACX,WAAW,GAAG,aAAG,CAAC,IAAI,EAAE,CAAC;YACzB,MAAM;QACV,KAAK,MAAM;YACP,WAAW,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM;QACV,KAAK,QAAQ;YACT,WAAW,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAC5C,MAAM;QACV,KAAK,QAAQ;YACT,WAAW,GAAG,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC/D,MAAM;QACV,KAAK,OAAO;YACR,WAAW,GAAG,qBAAqB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM;QACV,KAAK,WAAW;YACZ,WAAW,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAC/C,MAAM;QACV,KAAK,OAAO;YACR,WAAW,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC3C,MAAM;QACV,KAAK,MAAM;YACP,WAAW,GAAG,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YAC7D,MAAM;KACb;IACD,IAAI,OAAO,IAAI,KAAK,EAAE;QAClB,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC7E;SAAM,IAAI,UAAU,IAAI,KAAK,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;QACvD,WAAW,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;KACxC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAqB;IAC/C,IAAI,KAAK,CAAC,OAAO,EAAE;QACf,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAyG,EAAE,EAAE;YAC3I,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9D,CAAC,CAAC,CAAC;QACH,OAAO,aAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;KAC/B;IACD,OAAO,aAAG,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAuB;IACnD,IAAI,MAAM,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC;IAC1B,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE;QAC3B,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;KAC7B;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACX,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAClC;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACX,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAClC;IACD,IAAI,KAAK,CAAC,IAAI,EAAE;QACZ,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;KAC3D;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAuB,EAAE,MAAc,EAAE,SAAoB;IACzF,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClD,OAAO,uBAAuB,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAsB,EAAE,MAAc;IACjE,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,aAAG,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;KAChC;IACD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClC,OAAO,aAAG,CAAC,IAAI,EAAE;aACZ,GAAG,CAAC,IAAI,SAAS,eAAe,CAAC;aACjC,MAAM,CACH,aAAG,CAAC,MAAM,CAAC;YACP,UAAU,EAAE,cAAc;YAC1B,CAAC,aAAa,CAAC,EAAE,UAAU;SAC9B,CAAC,CACL,CAAC;KACT;SAAM;QACH,kEAAkE;QAClE,kCAAkC;QAClC,OAAO,aAAG,CAAC,YAAY,EAAE;aACpB,WAAW,CAAC,IAAI,aAAa,EAAE,EAAE;YAC9B,MAAM,EAAE,gBAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;gBACtC,OAAO;oBACH,EAAE,EAAE,SAAS;oBACb,IAAI,EAAE,aAAG,CAAC,IAAI,EAAE;yBACX,GAAG,CAAC,IAAI,SAAS,eAAe,CAAC;yBACjC,MAAM,CACH,aAAG,CAAC,MAAM,CAAC;wBACP,UAAU,EAAE,cAAc;wBAC1B,CAAC,aAAa,CAAC,EAAE,aAAG,CAAC,MAAM,EAAE;qBAChC,CAAC,CACL;iBACR,CAAC;YACN,CAAC,CAAC;SACL,CAAC;aACD,KAAK,CAAC;YACH,QAAQ,EAAE;gBACN,kBAAkB,EAAE,cAAc,aAAa,oCAAoC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;aACjH;YACD,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;SACrC,CAAC,CAAC;KACV;AACL,CAAC;AAED,SAAS,yBAAyB,CAAC,KAA0B;IACzD,6EAA6E;IAC7E,8CAA8C;IAC9C,OAAO,aAAG,CAAC,MAAM,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAqB,EAAE,MAAc,EAAE,SAAoB;IACrF,IAAI,KAAK,CAAC,KAAK,EAAE;QACb,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC3E,OAAO,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;KACzC;IACD,OAAO,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,aAAG,CAAC,MAAM,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAsB;IACjD,MAAM,gBAAgB,GAAG,gBAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE;QAC/D,MAAM,UAAU,GAAG,gBAAC,CAAC,IAAI,CAAC,WAAW,CAAiB,CAAC;QACvD,MAAM,YAAY,GAAG,gBAAC,CAAC,MAAM,CACzB,UAAU,EACV,CAAC,MAA+C,EAAE,SAAS,EAAE,EAAE;YAC3D,MAAM,YAAY,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;YACxD,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,MAAM,CAAC;aACjB;YACD,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;YAC3C,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,WAAW,EAAE;gBACd,OAAO,MAAM,CAAC;aACjB;YACD,MAAM,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC,EACD,EAAE,CACL,CAAC;QACF,OAAO,aAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,OAAO,aAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,uBAAuB,GAAgE;IACzF,SAAS,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,SAAS,CAAC;IACvE,cAAc,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,WAAW,CAAC;IAC9E,aAAa,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,aAAa,CAAC;IAC/E,YAAY,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,YAAY,CAAC;IAC7E,WAAW,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,WAAW,CAAC;IAC3E,UAAU,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,UAAU,CAAC;IACzE,SAAS,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,SAAS,CAAC;IACvE,OAAO,EAAE,mBAAmB;IAC5B,MAAM,EAAE,mBAAmB;IAC3B,KAAK,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,KAAK,CAAC;IAC/D,MAAM,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,MAAM,CAAC;IACjE,UAAU,EAAE,0BAA0B;IACtC,QAAQ,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,QAAQ,CAAC;IACrE,SAAS,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,SAAS,CAAC;IACvE,UAAU,EAAE,yBAAyB;IACrC,SAAS,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,SAAS,CAAC;IACvE,SAAS,EAAE,0BAA0B;IACrC,cAAc,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,cAAc,CAAC;IACjF,eAAe,EAAE,0BAA0B;IAC3C,kBAAkB,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,WAAW,CAAC;IAClF,cAAc,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,cAAc,CAAC;IACjF,YAAY,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,YAAY,CAAC;IAC7E,WAAW,EAAE,mBAAmB;IAChC,WAAW,EAAE,0BAA0B;IACvC,WAAW,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,WAAW,CAAC;IAC3E,SAAS,EAAE,8BAA8B,CAAC,kCAAkB,CAAC,SAAS,CAAC;IACvE,OAAO,EAAE,sBAAsB;CAClC,CAAC;AAEF,SAAS,8BAA8B,CAAC,WAAkB;IACtD,OAAO,CAAC,WAAgB,EAAE,EAAE;QACxB,IAAI,WAAW,KAAK,GAAG,EAAE;YACrB,OAAO,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC;SAC7C;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YAC5B,OAAO,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC;SAC7C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,WAAgB;IACzC,IAAI,WAAW,KAAK,GAAG,EAAE;QACrB,OAAO,aAAG,CAAC,MAAM,CAAC;YACd,GAAG,EAAE,aAAG,CAAC,MAAM,EAAE;YACjB,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE;YACpB,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE;YAClB,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE;SACtB,CAAC,CAAC;KACN;IACD,mCAAmC;IACnC,WAAW,GAAG,gBAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,gBAAC,CAAC,MAAM,CACvB,WAAW,EACX,CAAC,UAAe,EAAE,OAAY,EAAE,EAAE;QAC9B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,OAAO,UAAU,CAAC;SACrB;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,cAAc,EAAE;YACjB,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;SACrD;aAAM;YACH,MAAM,MAAM,GAAG;gBACX,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;gBACpB,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;gBACpB,CAAC,EAAE,CAAC,MAAM,CAAC;gBACX,CAAC,EAAE,CAAC,OAAO,CAAC;gBACZ,CAAC,EAAE,CAAC,KAAK,CAAC;gBACV,CAAC,EAAE,CAAC,QAAQ,CAAC;aAChB,CAAC;YACF,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAsC,CAAC;YACxE,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAClC;QACD,IAAI,WAAW,GAAG,aAAG,CAAC,MAAM,EAAE,CAAC;QAC/B,IAAI,OAAO,EAAE;YACT,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACvE,IAAI,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAC,CAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,UAAU,CAAC;aACrB;YACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpB,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAC7C;iBAAM;gBACH,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpB,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAChD;aACJ;SACJ;QACD,gBAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE;YAChC,cAAM,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACtB,CAAC,EACD,EAAE,CACL,CAAC;IACF,MAAM,YAAY,GAAG,gBAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAG,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IACtF,OAAO,aAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,0BAA0B,CAAC,WAAgB;IAChD,OAAO,aAAG,CAAC,KAAK,CAAC,GAAG,gBAAC,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,yBAAyB,CAAC,WAAgB;IAC/C,IAAI,WAAW,KAAK,GAAG,EAAE;QACrB,OAAO,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,kCAAkB,CAAC,UAAU,CAAC,CAAC;KAC/D;IACD,WAAW,GAAG,gBAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,gBAAC,CAAC,MAAM,CACxB,WAAW,EACX,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACnB,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACnB,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpB,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAClB,OAAO,WAAW,CAAC;SACtB;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,IAAI,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAC,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;SAC7C;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE;YACpC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EACD,IAAI,GAAG,EAAU,CACpB,CAAC;IACF,OAAO,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,WAAgB;IAC5C,IAAI,WAAW,KAAK,GAAG,EAAE;QACrB,OAAO,aAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KAC7D;IACD,WAAW,GAAG,gBAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,gBAAC,CAAC,MAAM,CACxB,WAAW,EACX,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACnB,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACnB,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpB,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAClB,OAAO,WAAW,CAAC;SACtB;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,IAAI,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAC,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,WAAW,CAAC;SACtB;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;SACrC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE;YAClC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACtB;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EACD,IAAI,GAAG,EAAU,CACpB,CAAC;IACF,OAAO,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;AAC1C,CAAC"}

package/dist/utils/model-extender.d.ts CHANGED Viewed

@@ -1,3 +1,10 @@
 import { Model, ModelMap } from '../config/config-types';
-export declare function extendModels(models: Model[]): Model[];
-export declare function extendModelMap(models: ModelMap): ModelMap;
+import { ConfigValidationError } from '../config/config-errors';
+export declare function extendModelArray(models: Model[]): {
+    models: Model[];
+    errors: ConfigValidationError[];
+};
+export declare function extendModelMap(models: ModelMap): {
+    models: ModelMap;
+    errors: ConfigValidationError[];
+};

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

@@ -3,31 +3,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendModelMap = exports.extendModels = void 0;
+exports.extendModelMap = exports.extendModelArray = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("@stackbit/utils");
-function extendModels(models) {
+const config_errors_1 = require("../config/config-errors");
+function extendModelArray(models) {
     const memorized = lodash_1.default.memoize(extendModel, (model, modelName) => modelName);
     const modelsByName = lodash_1.default.keyBy(models, 'name');
-    return lodash_1.default.map(models, (model) => {
+    return lodash_1.default.reduce(models, (result, model) => {
         // YamlModel is the same as Model just without 'name' and '__metadata' properties
-        return memorized(model, model.name, modelsByName);
-    });
+        const { model: extendedModel, errors } = memorized(model, model.name, modelsByName);
+        return {
+            models: result.models.concat(extendedModel),
+            errors: result.errors.concat(errors)
+        };
+    }, { models: [], errors: [] });
 }
-exports.extendModels = extendModels;
+exports.extendModelArray = extendModelArray;
 function extendModelMap(models) {
     const memorized = lodash_1.default.memoize(extendModel, (model, modelName) => modelName);
-    return lodash_1.default.mapValues(models, (model, modelName) => {
-        return memorized(model, modelName, models);
-    });
+    return lodash_1.default.reduce(models, (result, model, modelName) => {
+        const { model: extendedModel, errors } = memorized(model, modelName, models);
+        return {
+            models: lodash_1.default.assign(result.models, { [modelName]: extendedModel }),
+            errors: result.errors.concat(errors)
+        };
+    }, { models: {}, errors: [] });
 }
 exports.extendModelMap = extendModelMap;
 function extendModel(model, modelName, modelsByName, _extendPath = []) {
-    assert(!lodash_1.default.includes(_extendPath, modelName), `cyclic dependency detected in model extend tree: ${_extendPath.join(' -> ')} -> ${modelName}`);
+    if (lodash_1.default.includes(_extendPath, modelName)) {
+        return {
+            model,
+            errors: [
+                new config_errors_1.ConfigValidationError({
+                    type: 'model.extends.circular',
+                    message: `cyclic dependency detected in model extend tree: ${_extendPath.join(' -> ')} -> ${modelName}`,
+                    fieldPath: [],
+                    value: null
+                })
+            ]
+        };
+    }
     let _extends = lodash_1.default.get(model, 'extends');
     let fields = lodash_1.default.get(model, 'fields');
     if (!_extends) {
-        return model;
+        return { model, errors: [] };
     }
     delete model['extends'];
     if (!lodash_1.default.isArray(_extends)) {
@@ -37,16 +58,38 @@ function extendModel(model, modelName, modelsByName, _extendPath = []) {
         fields = [];
         model.fields = fields;
     }
+    let errors = [];
     lodash_1.default.forEach(_extends, (superModelName) => {
-        let superModel = lodash_1.default.get(modelsByName, superModelName);
-        assert(superModel, `model '${modelName}' extends non existing model '${superModelName}'`);
-        assert(superModel.type === 'object', `model '${modelName}' extends models of type '${superModel.type}', only model of the 'object' type can be extended`);
-        superModel = extendModel(superModel, superModelName, modelsByName, _extendPath.concat(modelName));
-        utils_1.copyIfNotSet(superModel, 'hideContent', model, 'hideContent');
-        utils_1.copyIfNotSet(superModel, 'singleInstance', model, 'singleInstance');
-        utils_1.copyIfNotSet(superModel, 'labelField', model, 'labelField');
+        const superModel = lodash_1.default.get(modelsByName, superModelName);
+        if (!superModel) {
+            errors.push(new config_errors_1.ConfigValidationError({
+                type: 'model.extends.model.not.found',
+                message: `model '${modelName}' extends non existing model '${superModelName}'`,
+                fieldPath: [],
+                value: null
+            }));
+            return;
+        }
+        if (superModel.type !== 'object') {
+            errors.push(new config_errors_1.ConfigValidationError({
+                type: 'model.extends.non.object.model',
+                message: `model '${modelName}' extends models of type '${superModel.type}', only model of the 'object' type can be extended`,
+                fieldPath: [],
+                value: null
+            }));
+            return;
+        }
+        const { model: extendedSuperModel, errors: nestedErrors } = extendModel(superModel, superModelName, modelsByName, _extendPath.concat(modelName));
+        errors = errors.concat(nestedErrors);
+        utils_1.copyIfNotSet(extendedSuperModel, 'hideContent', model, 'hideContent');
+        utils_1.copyIfNotSet(extendedSuperModel, 'singleInstance', model, 'singleInstance');
+        utils_1.copyIfNotSet(extendedSuperModel, 'labelField', model, 'labelField');
+        utils_1.copyIfNotSet(extendedSuperModel, 'variantField', model, 'variantField');
+        if (Array.isArray(extendedSuperModel.fieldGroups) && extendedSuperModel.fieldGroups.length > 0) {
+            model.fieldGroups = lodash_1.default.uniqBy(lodash_1.default.concat(extendedSuperModel.fieldGroups, lodash_1.default.get(model, 'fieldGroups', [])), 'name');
+        }
         let idx = 0;
-        lodash_1.default.forEach(superModel.fields, (superField) => {
+        lodash_1.default.forEach(extendedSuperModel.fields, (superField) => {
             const field = lodash_1.default.find(fields, { name: superField.name });
             if (field) {
                 lodash_1.default.defaultsDeep(field, lodash_1.default.cloneDeep(superField));
@@ -56,11 +99,6 @@ function extendModel(model, modelName, modelsByName, _extendPath = []) {
             }
         });
     });
-    return model;
-}
-function assert(value, message) {
-    if (!value) {
-        throw new Error(message);
-    }
+    return { model, errors };
 }
 //# sourceMappingURL=model-extender.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"model-extender.js","sourceRoot":"","sources":["../../src/utils/model-extender.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,2CAA+C;~~AAI~~/C,SAAgB,~~YAAY~~,CAAC,MAAe;~~IACxC~~,MAAM,SAAS,GAAG,gBAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,~~KAAgB~~,EAAE,~~SAAiB~~,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;~~IAC7F~~,MAAM,YAAY,GAAG,gBAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,OAAO,gBAAC,CAAC,~~GAAG~~,~~CAAC~~,MAAM,~~EAAE~~,CAAC,KAAK,EAAE,EAAE;~~QAC3B~~,iFAAiF;QACjF,~~OAAO~~,SAAS,CAAC,~~KAAkB~~,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,~~CAAU~~,CAAC;~~IAC5E~~,CAAC,CAAC,CAAC;~~AACP~~,CAAC;~~AAPD~~,~~oCAOC~~;AAED,SAAgB,cAAc,CAAC,MAAgB;IAC3C,MAAM,SAAS,GAAG,gBAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,~~KAAgB~~,EAAE,~~SAAiB~~,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;~~IAC7F~~,OAAO,gBAAC,CAAC,~~SAAS~~,~~CAAC~~,MAAM,~~EAAE~~,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;~~QAC5C~~,~~OAAO~~,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;~~IAC~~/C,CAAC,CAAC,CAAC;~~AACP~~,CAAC;~~AALD~~,~~wCAKC~~;AAED,SAAS,WAAW,~~CAAC~~,~~KAAgB~~,~~EAAE~~,SAAiB,~~EAAE~~,~~YAAuC~~,~~EAAE~~,cAAwB,EAAE;~~IACzH~~,~~MAAM~~,~~CAAC,CAAC,~~gBAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,oDAAoD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,SAAS,EAAE,CAAC,CAAC;~~IAE5I~~,IAAI,QAAQ,~~GAAG~~,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;~~IACvC~~,IAAI,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEpC,IAAI,CAAC,QAAQ,EAAE;QACX,OAAO,KAAK,CAAC;~~KAChB~~;IAED,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC;IAExB,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACtB,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC;KACzB;IAED,IAAI,CAAC,MAAM,EAAE;QACT,MAAM,GAAG,EAAE,CAAC;QACZ,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;KACzB;IAED,gBAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,EAAE;QACnC,~~IAAI~~,UAAU,GAAG,gBAAC,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;~~QACrD~~,~~MAAM~~,CAAC,UAAU,EAAE,UAAU,SAAS,iCAAiC,cAAc,GAAG,CAAC,CAAC;~~QAC1F~~,~~MAAM~~,~~CACF~~,UAAU,CAAC,IAAI,KAAK,QAAQ,~~EAC5B~~,UAAU,SAAS,6BAA6B,UAAU,CAAC,IAAI,oDAAoD,~~CACtH~~,CAAC;~~QACF~~,~~UAAU~~,GAAG,WAAW,CAAC,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;~~QAClG~~,oBAAY,CAAC,~~UAAU~~,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;~~QAC9D~~,oBAAY,CAAC,~~UAAU~~,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;~~QACpE~~,oBAAY,CAAC,~~UAAU~~,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;~~QAC5D~~,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,gBAAC,CAAC,OAAO,CAAC,~~UAAU~~,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE;~~YACxC~~,MAAM,KAAK,GAAG,gBAAC,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,IAAI,KAAK,EAAE;gBACP,gBAAC,CAAC,YAAY,CAAC,KAAK,EAAE,gBAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;aAClD;iBAAM;gBACH,MAAO,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,gBAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;aACrD;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,~~KAAK,CAAC;AACjB,CAAC;AAED,SAAS,MAAM,CAAC,KAAU,~~EAAE,~~OAAe;IACvC,IAAI,CAAC,~~KAAK,EAAE~~;QACR~~,MAAM,~~IAAI~~,~~KAAK,~~CAAC~~,OAAO,CAAC,CAAC~~;~~KAC5B;AACL~~,CAAC"}
1	+ {"version":3,"file":"model-extender.js","sourceRoot":"","sources":["../../src/utils/model-extender.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@stackbit/sdk",
-    "version": "0.2.5",
+    "version": "0.2.10",
     "description": "Stackbit SDK",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/src/.DS_Store CHANGED Viewed

Binary file

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

@@ -18,11 +18,12 @@ import {
     isObjectField,
     isObjectListItems,
     isPageModel,
+    isDataModel,
     isReferenceField,
     iterateModelFieldsRecursively
 } from '../utils';
 import { append, parseFile, readDirRecursively, reducePromise, rename } from '@stackbit/utils';
-import { Config, FieldEnum, FieldModel, FieldObjectProps, Model, PageModel, YamlModel } from './config-types';
+import { Config, DataModel, FieldEnum, FieldModel, FieldObjectProps, Model, PageModel, YamlModel } from './config-types';
 import { loadPresets } from './presets-loader';
 export interface ConfigLoaderOptions {
@@ -86,16 +87,17 @@ export function validateAndNormalizeConfig(config: any): NormalizedValidationRes
     // extend config models having the "extends" property
     // this must be done before main config validation as some properties like
     // the labelField will not work when validating models without extending them first
-    config.models = extendModelMap(config?.models || {});
+    const { models, errors: extendModelErrors } = extendModelMap(config?.models || {});
+    config.models = models;
-    // extend config - backward compatibility updates, adding extra fields like "markdown_content", "type" and "layout",
+    // normalize config - backward compatibility updates, adding extra fields like "markdown_content", "type" and "layout",
     // and setting other default values.
-    config = extendConfig(config);
+    config = normalizeConfig(config);
     // validate config
     const configValidationResult = validateConfig(config);
-    const errors = [...contentModelsValidationResult.errors, ...configValidationResult.errors];
+    const errors = [...contentModelsValidationResult.errors, ...extendModelErrors, ...configValidationResult.errors];
     return normalizeValidationResult({
         valid: _.isEmpty(errors),
         value: configValidationResult.value,
@@ -225,7 +227,7 @@ async function loadConfigFromDotStackbit(dirPath: string) {
     return _.isEmpty(config) ? null : config;
 }
-function extendConfig(config: any): any {
+function normalizeConfig(config: any): any {
     const pageLayoutKey = _.get(config, 'pageLayoutKey', 'layout');
     const objectTypeKey = _.get(config, 'objectTypeKey', 'type');
     const stackbitYamlVersion = String(_.get(config, 'stackbitVersion', ''));
@@ -243,10 +245,15 @@ function extendConfig(config: any): any {
             // rename old 'template' property to 'layout'
             rename(model, 'template', 'layout');
+            updatePageUrlPath(model);
+            updatePageFilePath(model, config);
             addMarkdownContentField(model);
             // TODO: update schema-editor to not show layout field
             addLayoutFieldToPageModel(model, pageLayoutKey);
+        } else if (isDataModel(model)) {
+            updateDataFilePath(model, config);
         }
         if (isListDataModel(model)) {
@@ -331,6 +338,53 @@ function extendConfig(config: any): any {
     return config;
 }
+function updatePageUrlPath(model: PageModel) {
+    // set default urlPath if not set
+    if (!model.urlPath) {
+        model.urlPath = '/{slug}';
+    }
+}
+/**
+ * Sets the page model's filePath pattern.
+ * If the model has `filePath` property, it is prefixed with `pagesDir` and returned.
+ * If the model has no `filePath` property, then `filePath` is naively inferred by
+ * prefixing `urlPath` with `pagesDir` and appending the `.md` extension.
+ */
+function updatePageFilePath(model: PageModel, config: Config) {
+    // do not define filePath for singleton pages
+    if (model.file) {
+        return;
+    }
+    let filePath = model?.filePath;
+    if (!filePath) {
+        const urlPath = model.urlPath;
+        if (urlPath === '/') {
+            filePath = 'index.md';
+        } else if (_.trim(urlPath, '/') === 'posts/{slug}' && config.ssgName === 'jekyll') {
+            filePath = '_posts/{moment_format("YYYY-MM-DD")}-{slug}.md';
+        } else {
+            filePath = _.trim(urlPath, '/') + '.md';
+        }
+    }
+    const parentDir = _.trim(config.pagesDir ?? '', '/');
+    model.filePath = path.join(parentDir, filePath);
+}
+function updateDataFilePath(model: DataModel, config: Config) {
+    // do not define filePath for singleton files
+    if (model.file) {
+        return;
+    }
+    let filePath = model?.filePath;
+    if (!filePath) {
+        const folder = _.trim(_.get(model, 'folder'), '/');
+        filePath = _.trim(`${folder}/{slug}.json`, '/');
+    }
+    const parentDir = _.trim(config.dataDir ?? '', '/');
+    model.filePath = path.join(parentDir, filePath);
+}
 function addMarkdownContentField(model: PageModel) {
     if (!model.hideContent) {
         append(model, 'fields', {
@@ -471,7 +525,7 @@ function validateAndExtendContentModels(config: any): ConfigValidationResult {
             return {
                 type: 'data',
                 ...(contentModel.newFilePath ? { filePath: contentModel.newFilePath } : {}),
-                ..._.omit(contentModel, ['newFilePath']),
+                ..._.omit(contentModel, ['isPage', 'newFilePath']),
                 ..._.omit(model, 'type')
             };
         } else {

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

@@ -328,7 +328,10 @@ function stylePropSizeSchema(styleConfig: any) {
     styleConfig = _.castArray(styleConfig);
     const dirSchemas = _.reduce(
         styleConfig,
-        (dirSchemas: any, pattern) => {
+        (dirSchemas: any, pattern: any) => {
+            if (typeof pattern !== 'string') {
+                return dirSchemas;
+            }
             const directionMatch = pattern.match(/^[xylrtb]/);
             const directions = [];
             if (!directionMatch) {
@@ -342,19 +345,22 @@ function stylePropSizeSchema(styleConfig: any) {
                     t: ['top'],
                     b: ['bottom']
                 };
-                const dirMatch: 'x' | 'y' | 'l' | 'r' | 't' | 'b' = directionMatch[0];
+                const dirMatch = directionMatch[0] as 'x' | 'y' | 'l' | 'r' | 't' | 'b';
                 directions.push(...dirMap[dirMatch]);
                 pattern = pattern.substring(1);
             }
             let valueSchema = Joi.number();
             if (pattern) {
-                const parts = pattern.split(':');
+                const parts = pattern.split(':').map((value: string) => Number(value));
+                if (_.some(parts, _.isNaN)) {
+                    return dirSchemas;
+                }
                 if (parts.length === 1) {
-                    valueSchema = valueSchema.valid(Number(parts[0]));
+                    valueSchema = valueSchema.valid(parts[0]);
                 } else {
-                    valueSchema = valueSchema.min(Number(parts[0])).max(Number(parts[1]));
+                    valueSchema = valueSchema.min(parts[0]).max(parts[1]);
                     if (parts.length === 3) {
-                        valueSchema = valueSchema.multiple(Number(parts[3]));
+                        valueSchema = valueSchema.multiple(parts[3]);
                     }
                 }
             }
@@ -370,7 +376,7 @@ function stylePropSizeSchema(styleConfig: any) {
 }
 function stylePropObjectValueSchema(styleConfig: any) {
-    return Joi.valid(..._.map(styleConfig, (object) => object.value));
+    return Joi.valid(..._.map(styleConfig, (object) => _.get(object, 'value')));
 }
 function stylePropFontWeightSchema(styleConfig: any) {
@@ -390,12 +396,15 @@ function stylePropFontWeightSchema(styleConfig: any) {
             if (_.isEmpty(value)) {
                 return validValues;
             }
-            const parts = value.split(':');
+            const parts = value.split(':').map((value) => Number(value));
+            if (_.some(parts, _.isNaN)) {
+                return validValues;
+            }
             if (parts.length === 1) {
-                return validValues.add(parts[0]!);
+                return validValues.add(String(parts[0]!));
             }
-            const start = Number(parts[0]);
-            const end = Number(parts[1]);
+            const start = parts[0]!;
+            const end = parts[1]!;
             for (let i = start; i <= end; i += 100) {
                 validValues.add(String(i));
             }
@@ -423,12 +432,15 @@ function stylePropOpacitySchema(styleConfig: any) {
             if (_.isEmpty(value)) {
                 return validValues;
             }
-            const parts = value.split(':');
+            const parts = value.split(':').map((value) => Number(value));
+            if (_.some(parts, _.isNaN)) {
+                return validValues;
+            }
             if (parts.length === 1) {
-                return validValues.add(Number(parts[0]!));
+                return validValues.add(parts[0]!);
             }
-            const start = Number(parts[0]);
-            const end = Number(parts[1]);
+            const start = parts[0]!;
+            const end = parts[1]!;
             for (let i = start; i <= end; i += 5) {
                 validValues.add(i);
             }

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

@@ -2,31 +2,65 @@ import _ from 'lodash';
 import { copyIfNotSet } from '@stackbit/utils';
 import { Model, YamlModel, ModelMap } from '../config/config-types';
+import { ConfigValidationError } from '../config/config-errors';
-export function extendModels(models: Model[]): Model[] {
-    const memorized = _.memoize(extendModel, (model: YamlModel, modelName: string) => modelName);
+export function extendModelArray(models: Model[]): { models: Model[]; errors: ConfigValidationError[] } {
+    const memorized = _.memoize(extendModel, (model, modelName) => modelName);
     const modelsByName = _.keyBy(models, 'name');
-    return _.map(models, (model) => {
-        // YamlModel is the same as Model just without 'name' and '__metadata' properties
-        return memorized(model as YamlModel, model.name, modelsByName) as Model;
-    });
+    return _.reduce(
+        models,
+        (result: { models: Model[]; errors: ConfigValidationError[] }, model) => {
+            // YamlModel is the same as Model just without 'name' and '__metadata' properties
+            const { model: extendedModel, errors } = memorized(model, model.name, modelsByName);
+            return {
+                models: result.models.concat(extendedModel),
+                errors: result.errors.concat(errors)
+            };
+        },
+        { models: [], errors: [] }
+    );
 }
-export function extendModelMap(models: ModelMap): ModelMap {
-    const memorized = _.memoize(extendModel, (model: YamlModel, modelName: string) => modelName);
-    return _.mapValues(models, (model, modelName) => {
-        return memorized(model, modelName, models);
-    });
+export function extendModelMap(models: ModelMap): { models: ModelMap; errors: ConfigValidationError[] } {
+    const memorized = _.memoize(extendModel, (model, modelName) => modelName);
+    return _.reduce(
+        models,
+        (result: { models: ModelMap; errors: ConfigValidationError[] }, model, modelName) => {
+            const { model: extendedModel, errors } = memorized(model, modelName, models);
+            return {
+                models: _.assign(result.models, { [modelName]: extendedModel }),
+                errors: result.errors.concat(errors)
+            };
+        },
+        { models: {}, errors: [] }
+    );
 }
-function extendModel(model: YamlModel, modelName: string, modelsByName: Record<string, YamlModel>, _extendPath: string[] = []) {
-    assert(!_.includes(_extendPath, modelName), `cyclic dependency detected in model extend tree: ${_extendPath.join(' -> ')} -> ${modelName}`);
+function extendModel<T extends Model | YamlModel>(
+    model: T,
+    modelName: string,
+    modelsByName: ModelMap,
+    _extendPath: string[] = []
+): { model: T; errors: ConfigValidationError[] } {
+    if (_.includes(_extendPath, modelName)) {
+        return {
+            model,
+            errors: [
+                new ConfigValidationError({
+                    type: 'model.extends.circular',
+                    message: `cyclic dependency detected in model extend tree: ${_extendPath.join(' -> ')} -> ${modelName}`,
+                    fieldPath: [],
+                    value: null
+                })
+            ]
+        };
+    }
-    let _extends = _.get(model, 'extends');
+    let _extends: any = _.get(model, 'extends');
     let fields = _.get(model, 'fields');
     if (!_extends) {
-        return model;
+        return { model, errors: [] };
     }
     delete model['extends'];
@@ -40,19 +74,43 @@ function extendModel(model: YamlModel, modelName: string, modelsByName: Record<s
         model.fields = fields;
     }
+    let errors: ConfigValidationError[] = [];
     _.forEach(_extends, (superModelName) => {
-        let superModel = _.get(modelsByName, superModelName);
-        assert(superModel, `model '${modelName}' extends non existing model '${superModelName}'`);
-        assert(
-            superModel.type === 'object',
-            `model '${modelName}' extends models of type '${superModel.type}', only model of the 'object' type can be extended`
-        );
-        superModel = extendModel(superModel, superModelName, modelsByName, _extendPath.concat(modelName));
-        copyIfNotSet(superModel, 'hideContent', model, 'hideContent');
-        copyIfNotSet(superModel, 'singleInstance', model, 'singleInstance');
-        copyIfNotSet(superModel, 'labelField', model, 'labelField');
+        const superModel = _.get(modelsByName, superModelName);
+        if (!superModel) {
+            errors.push(
+                new ConfigValidationError({
+                    type: 'model.extends.model.not.found',
+                    message: `model '${modelName}' extends non existing model '${superModelName}'`,
+                    fieldPath: [],
+                    value: null
+                })
+            );
+            return;
+        }
+        if (superModel.type !== 'object') {
+            errors.push(
+                new ConfigValidationError({
+                    type: 'model.extends.non.object.model',
+                    message: `model '${modelName}' extends models of type '${superModel.type}', only model of the 'object' type can be extended`,
+                    fieldPath: [],
+                    value: null
+                })
+            );
+            return;
+        }
+        const { model: extendedSuperModel, errors: nestedErrors } = extendModel(superModel, superModelName, modelsByName, _extendPath.concat(modelName));
+        errors = errors.concat(nestedErrors);
+        copyIfNotSet(extendedSuperModel, 'hideContent', model, 'hideContent');
+        copyIfNotSet(extendedSuperModel, 'singleInstance', model, 'singleInstance');
+        copyIfNotSet(extendedSuperModel, 'labelField', model, 'labelField');
+        copyIfNotSet(extendedSuperModel, 'variantField', model, 'variantField');
+        if (Array.isArray(extendedSuperModel.fieldGroups) && extendedSuperModel.fieldGroups.length > 0) {
+            model.fieldGroups = _.uniqBy(_.concat(extendedSuperModel.fieldGroups, _.get(model, 'fieldGroups', [])), 'name');
+        }
         let idx = 0;
-        _.forEach(superModel.fields, (superField) => {
+        _.forEach(extendedSuperModel.fields, (superField) => {
             const field = _.find(fields, { name: superField.name });
             if (field) {
                 _.defaultsDeep(field, _.cloneDeep(superField));
@@ -62,11 +120,5 @@ function extendModel(model: YamlModel, modelName: string, modelsByName: Record<s
         });
     });
-    return model;
-}
-function assert(value: any, message: string) {
-    if (!value) {
-        throw new Error(message);
-    }
+    return { model, errors };
 }