@stackbit/sdk 0.2.22 → 0.2.26

package/dist/config/config-consts.d.ts

@@ -1,6 +1,6 @@
 export declare const SSG_NAMES: readonly ["unibit", "jekyll", "hugo", "gatsby", "nextjs", "custom", "eleventy", "vuepress", "gridsome", "nuxt", "sapper", "hexo"];
 export declare const CMS_NAMES: readonly ["git", "contentful", "sanity", "forestry", "netlifycms"];
-export declare const FIELD_TYPES: readonly ["string", "url", "slug", "text", "markdown", "html", "number", "boolean", "enum", "date", "datetime", "color", "image", "file", "object", "model", "reference", "style", "list"];
+export declare const FIELD_TYPES: readonly ["string", "url", "slug", "text", "markdown", "html", "number", "boolean", "enum", "date", "datetime", "color", "image", "file", "json", "richText", "object", "model", "reference", "style", "list"];
 export declare const STYLE_PROPS: readonly ["objectFit", "objectPosition", "flexDirection", "justifyContent", "justifyItems", "justifySelf", "alignContent", "alignItems", "alignSelf", "padding", "margin", "width", "height", "fontFamily", "fontSize", "fontStyle", "fontWeight", "textAlign", "textColor", "textDecoration", "backgroundColor", "backgroundPosition", "backgroundSize", "borderRadius", "borderWidth", "borderColor", "borderStyle", "boxShadow", "opacity"];
 export declare const STYLE_PROPS_VALUES: {
     nineRegions: string[];

package/dist/config/config-consts.js

@@ -20,6 +20,8 @@ exports.FIELD_TYPES = [
     'color',
     'image',
     'file',
+    'json',
+    'richText',
     'object',
     'model',
     'reference',

package/dist/config/config-consts.js.map

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

package/dist/config/config-loader.d.ts

@@ -1,7 +1,8 @@
 import { ConfigError, ConfigLoadError, ConfigValidationError } from './config-errors';
-import { Config } from './config-types';
+import { Config, Model, ModelsSource } from './config-types';
 export interface ConfigLoaderOptions {
     dirPath: string;
+    modelsSource?: ModelsSource;
 }
 export interface ConfigLoaderResult {
     valid: boolean;
@@ -14,8 +15,8 @@ export interface NormalizedValidationResult {
     errors: ConfigValidationError[];
 }
 export interface TempConfigLoaderResult {
-    config?: any;
+    config?: Record<string, unknown>;
     errors: ConfigLoadError[];
 }
-export declare function loadConfig({ dirPath }: ConfigLoaderOptions): Promise<ConfigLoaderResult>;
-export declare function validateAndNormalizeConfig(config: any): NormalizedValidationResult;
+export declare function loadConfig({ dirPath, modelsSource }: ConfigLoaderOptions): Promise<ConfigLoaderResult>;
+export declare function validateAndNormalizeConfig(config: any, externalModels?: Model[]): NormalizedValidationResult;

package/dist/config/config-loader.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -14,65 +33,73 @@ const config_errors_1 = require("./config-errors");
 const utils_1 = require("../utils");
 const utils_2 = require("@stackbit/utils");
 const presets_loader_1 = require("./presets-loader");
-async function loadConfig({ dirPath }) {
-    let configLoadResult;
-    try {
-        configLoadResult = await loadConfigFromDir(dirPath);
-    }
-    catch (error) {
-        return {
-            valid: false,
-            config: null,
-            errors: [new config_errors_1.ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
-        };
-    }
-    if (!configLoadResult.config) {
+async function loadConfig({ dirPath, modelsSource }) {
+    const { config, errors: configLoadErrors } = await loadConfigFromDir(dirPath);
+    if (!config) {
         return {
             valid: false,
             config: null,
-            errors: configLoadResult.errors
+            errors: configLoadErrors
         };
     }
-    const normalizedResult = validateAndNormalizeConfig(configLoadResult.config);
+    const { models: externalModels, errors: externalModelsLoadErrors } = await loadModelsFromExternalSource(config, dirPath, modelsSource);
+    const normalizedResult = validateAndNormalizeConfig(config, externalModels);
     const presetsResult = await presets_loader_1.loadPresets(dirPath, normalizedResult.config);
     return {
         valid: normalizedResult.valid,
         config: presetsResult.config,
-        errors: [...configLoadResult.errors, ...normalizedResult.errors, ...presetsResult.errors]
+        errors: [...configLoadErrors, ...externalModelsLoadErrors, ...normalizedResult.errors, ...presetsResult.errors]
     };
 }
 exports.loadConfig = loadConfig;
-function validateAndNormalizeConfig(config) {
-    // validate the "contentModels" and extend config models with "contentModels"
-    // this must be done before main config validation to make it independent of "contentModels".
-    const contentModelsValidationResult = validateAndExtendContentModels(config);
-    config = contentModelsValidationResult.value;
+function validateAndNormalizeConfig(config, externalModels) {
     // extend config models having the "extends" property
-    // this must be done before main config validation as some properties like
+    // this must be done before any validation as some properties like
     // the labelField will not work when validating models without extending them first
-    const { models, errors: extendModelErrors } = utils_1.extendModelMap((config === null || config === void 0 ? void 0 : config.models) || {});
-    config.models = models;
+    const { models: extendedModels, errors: extendModelErrors } = utils_1.extendModelMap(config.models);
+    const extendedConfig = {
+        ...config,
+        models: extendedModels
+    };
+    const { config: mergedConfig, errors: externalModelsMergeErrors } = mergeConfigWithExternalModels(extendedConfig, externalModels);
+    // validate the "contentModels" and extend config models with "contentModels"
+    // this must be done before main config validation to make it independent of "contentModels".
+    const { value: configWithContentModels, errors: contentModelsErrors } = validateAndExtendContentModels(mergedConfig);
     // normalize config - backward compatibility updates, adding extra fields like "markdown_content", "type" and "layout",
     // and setting other default values.
-    config = normalizeConfig(config);
+    const normalizedConfig = normalizeConfig(configWithContentModels);
     // validate config
-    const configValidationResult = config_validator_1.validateConfig(config);
-    const errors = [...contentModelsValidationResult.errors, ...extendModelErrors, ...configValidationResult.errors];
+    const { value: validatedConfig, errors: validationErrors } = config_validator_1.validateConfig(normalizedConfig);
+    const errors = [...extendModelErrors, ...externalModelsMergeErrors, ...contentModelsErrors, ...validationErrors];
     return normalizeValidationResult({
         valid: lodash_1.default.isEmpty(errors),
-        value: configValidationResult.value,
+        value: validatedConfig,
         errors: errors
     });
 }
 exports.validateAndNormalizeConfig = validateAndNormalizeConfig;
 async function loadConfigFromDir(dirPath) {
-    const { config, error } = await loadConfigFromStackbitYaml(dirPath);
-    if (error) {
-        return { errors: [error] };
+    var _a;
+    try {
+        const { config, error } = await loadConfigFromStackbitYaml(dirPath);
+        if (error) {
+            return { errors: [error] };
+        }
+        const { models: modelsFromFiles, errors: fileModelsErrors } = await loadModelsFromFiles(dirPath, config);
+        const mergedModels = mergeConfigModelsWithModelsFromFiles((_a = config.models) !== null && _a !== void 0 ? _a : {}, modelsFromFiles);
+        return {
+            config: {
+                ...config,
+                models: mergedModels
+            },
+            errors: fileModelsErrors
+        };
+    }
+    catch (error) {
+        return {
+            errors: [new config_errors_1.ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
+        };
     }
-    const externalModelsResult = await loadExternalModels(dirPath, config);
-    config.models = lodash_1.default.assign(externalModelsResult.models, config.models);
-    return { config, errors: externalModelsResult.errors };
 }
 async function loadConfigFromStackbitYaml(dirPath) {
     const stackbitYamlPath = path_1.default.join(dirPath, 'stackbit.yaml');
@@ -91,47 +118,46 @@ async function loadConfigFromStackbitYaml(dirPath) {
     }
     return { config };
 }
-async function loadExternalModels(dirPath, config) {
+async function loadModelsFromFiles(dirPath, config) {
     const modelsSource = lodash_1.default.get(config, 'modelsSource', {});
     const sourceType = lodash_1.default.get(modelsSource, 'type', 'files');
-    if (sourceType === 'files') {
-        const defaultModelDirs = ['node_modules/@stackbit/components/models', '.stackbit/models'];
-        const modelDirs = lodash_1.default.castArray(lodash_1.default.get(modelsSource, 'modelDirs', defaultModelDirs)).map((modelDir) => lodash_1.default.trim(modelDir, '/'));
-        const modelFiles = await utils_2.reducePromise(modelDirs, async (modelFiles, modelDir) => {
-            const absModelsDir = path_1.default.join(dirPath, modelDir);
-            const dirExists = await fs_extra_1.default.pathExists(absModelsDir);
-            if (!dirExists) {
-                return modelFiles;
-            }
-            const files = await readModelFilesFromDir(absModelsDir);
-            return modelFiles.concat(files.map((filePath) => path_1.default.join(modelDir, filePath)));
-        }, []);
-        return utils_2.reducePromise(modelFiles, async (result, modelFile) => {
-            let model;
-            try {
-                model = await utils_2.parseFile(path_1.default.join(dirPath, modelFile));
-            }
-            catch (error) {
-                return {
-                    models: result.models,
-                    errors: result.errors.concat(new config_errors_1.ConfigLoadError(`error parsing model, file: ${modelFile}`))
-                };
-            }
-            const modelName = model === null || model === void 0 ? void 0 : model.name;
-            if (!modelName) {
-                return {
-                    models: result.models,
-                    errors: result.errors.concat(new config_errors_1.ConfigLoadError(`model does not have a name, file: ${modelFile}`))
-                };
-            }
-            result.models[modelName] = lodash_1.default.omit(model, 'name');
-            result.models[modelName].__metadata = {
-                filePath: modelFile
+    const defaultModelDirs = ['node_modules/@stackbit/components/models', '.stackbit/models'];
+    const modelDirs = sourceType === 'files'
+        ? lodash_1.default.castArray(lodash_1.default.get(modelsSource, 'modelDirs', defaultModelDirs)).map((modelDir) => lodash_1.default.trim(modelDir, '/'))
+        : defaultModelDirs;
+    const modelFiles = await utils_2.reducePromise(modelDirs, async (modelFiles, modelDir) => {
+        const absModelsDir = path_1.default.join(dirPath, modelDir);
+        const dirExists = await fs_extra_1.default.pathExists(absModelsDir);
+        if (!dirExists) {
+            return modelFiles;
+        }
+        const files = await readModelFilesFromDir(absModelsDir);
+        return modelFiles.concat(files.map((filePath) => path_1.default.join(modelDir, filePath)));
+    }, []);
+    return utils_2.reducePromise(modelFiles, async (result, modelFile) => {
+        let model;
+        try {
+            model = await utils_2.parseFile(path_1.default.join(dirPath, modelFile));
+        }
+        catch (error) {
+            return {
+                models: result.models,
+                errors: result.errors.concat(new config_errors_1.ConfigLoadError(`error parsing model, file: ${modelFile}`))
             };
-            return result;
-        }, { models: {}, errors: [] });
-    }
-    return { models: {}, errors: [] };
+        }
+        const modelName = model === null || model === void 0 ? void 0 : model.name;
+        if (!modelName) {
+            return {
+                models: result.models,
+                errors: result.errors.concat(new config_errors_1.ConfigLoadError(`model does not have a name, file: ${modelFile}`))
+            };
+        }
+        result.models[modelName] = lodash_1.default.omit(model, 'name');
+        result.models[modelName].__metadata = {
+            filePath: modelFile
+        };
+        return result;
+    }, { models: {}, errors: [] });
 }
 async function readModelFilesFromDir(modelsDir) {
     return await utils_2.readDirRecursively(modelsDir, {
@@ -144,6 +170,35 @@ async function readModelFilesFromDir(modelsDir) {
         }
     });
 }
+async function loadModelsFromExternalSource(config, dirPath, modelsSource) {
+    modelsSource = lodash_1.default.get(config, 'modelsSource', modelsSource);
+    const sourceType = lodash_1.default.get(modelsSource, 'type', 'files');
+    if (sourceType === 'files') {
+        return { models: [], errors: [] };
+    }
+    else if (sourceType === 'contentful') {
+        const contentfulModule = lodash_1.default.get(modelsSource, 'module', '@stackbit/cms-contentful');
+        const modulePath = path_1.default.resolve(dirPath, 'node_modules', contentfulModule);
+        const module = await Promise.resolve().then(() => __importStar(require(modulePath)));
+        try {
+            const { models } = await module.fetchAndConvertSchema(lodash_1.default.omit(modelsSource, ['type', 'module']));
+            return {
+                models: models,
+                errors: []
+            };
+        }
+        catch (error) {
+            return {
+                models: [],
+                errors: [new config_errors_1.ConfigLoadError(`Error fetching and converting Contentful schema, error: ${error.message}`, { originalError: error })]
+            };
+        }
+    }
+    return {
+        models: [],
+        errors: [new config_errors_1.ConfigLoadError(`modelsSource ${modelsSource} is unsupported`)]
+    };
+}
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function loadConfigFromDotStackbit(dirPath) {
     const stackbitDotPath = path_1.default.join(dirPath, '.stackbit');
@@ -172,6 +227,93 @@ async function loadConfigFromDotStackbit(dirPath) {
     }
     return lodash_1.default.isEmpty(config) ? null : config;
 }
+function mergeConfigModelsWithModelsFromFiles(configModels, modelsFromFiles) {
+    const mergedModels = lodash_1.default.mapValues(modelsFromFiles, (modelFromFile, modelName) => {
+        var _a, _b, _c;
+        // resolve thumbnails of models loaded from files
+        const modelFilePath = (_a = modelFromFile.__metadata) === null || _a === void 0 ? void 0 : _a.filePath;
+        resolveThumbnailPathForModel(modelFromFile, modelFilePath);
+        utils_1.iterateModelFieldsRecursively(modelFromFile, (field) => {
+            if (utils_1.isListField(field)) {
+                field = utils_1.normalizeListFieldInPlace(field);
+                field = field.items;
+            }
+            if (utils_1.isObjectField(field)) {
+                resolveThumbnailPathForModel(field, modelFilePath);
+            }
+            else if (utils_1.isEnumField(field)) {
+                resolveThumbnailPathForEnumField(field, modelFilePath);
+            }
+        });
+        const configModel = lodash_1.default.get(configModels, modelName);
+        if (!configModel) {
+            return modelFromFile;
+        }
+        return lodash_1.default.assign({}, modelFromFile, configModel, {
+            fields: lodash_1.default.unionBy((_b = configModel === null || configModel === void 0 ? void 0 : configModel.fields) !== null && _b !== void 0 ? _b : [], (_c = modelFromFile === null || modelFromFile === void 0 ? void 0 : modelFromFile.fields) !== null && _c !== void 0 ? _c : [], 'name')
+        });
+    });
+    return Object.assign({}, configModels, mergedModels);
+}
+function mergeConfigWithExternalModels(config, externalModels) {
+    var _a;
+    if (!externalModels || externalModels.length === 0) {
+        return {
+            config,
+            errors: []
+        };
+    }
+    const stackbitModels = (_a = config === null || config === void 0 ? void 0 : config.models) !== null && _a !== void 0 ? _a : {};
+    const errors = [];
+    const models = lodash_1.default.reduce(externalModels, (modelMap, externalModel) => {
+        const { name, ...rest } = externalModel;
+        return Object.assign(modelMap, { [name]: rest });
+    }, {});
+    lodash_1.default.forEach(stackbitModels, (stackbitModel, modelName) => {
+        var _a, _b;
+        let externalModel = models[modelName];
+        if (!externalModel) {
+            return;
+        }
+        const modelType = stackbitModel.type ? (stackbitModel.type === 'config' ? 'data' : stackbitModel.type) : (_a = externalModel.type) !== null && _a !== void 0 ? _a : 'object';
+        const urlPath = modelType === 'page' ? (_b = stackbitModel === null || stackbitModel === void 0 ? void 0 : stackbitModel.urlPath) !== null && _b !== void 0 ? _b : '/{slug}' : null;
+        externalModel = Object.assign({}, externalModel, lodash_1.default.pick(stackbitModel, ['__metadata', 'label', 'description', 'thumbnail', 'singleInstance', 'readOnly', 'labelField', 'fieldGroups']), utils_2.omitByNil({
+            type: modelType,
+            urlPath
+        }));
+        externalModel = utils_1.mapModelFieldsRecursively(externalModel, (field, modelKeyPath) => {
+            const stackbitField = utils_1.getModelFieldForModelKeyPath(stackbitModel, modelKeyPath);
+            if (!stackbitField) {
+                return field;
+            }
+            let override = {};
+            if (stackbitField.type === 'style') {
+                override = stackbitField;
+            }
+            else if (field.type === 'enum') {
+                override = lodash_1.default.pick(stackbitField, ['options']);
+            }
+            else if (field.type === 'color') {
+                override = { type: 'color' };
+            }
+            else if (field.type === 'number') {
+                override = lodash_1.default.pick(stackbitField, ['subtype', 'min', 'max', 'step', 'unit']);
+            }
+            else if (field.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);
+        });
+        models[modelName] = externalModel;
+    });
+    return {
+        config: {
+            ...config,
+            models: models
+        },
+        errors: errors
+    };
+}
 function normalizeConfig(config) {
     const pageLayoutKey = lodash_1.default.get(config, 'pageLayoutKey', 'layout');
     const objectTypeKey = lodash_1.default.get(config, 'objectTypeKey', 'type');
@@ -179,12 +321,15 @@ function normalizeConfig(config) {
     const ver = semver_1.default.coerce(stackbitYamlVersion);
     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) => {
-        var _a;
         if (!model) {
             return;
         }
+        if (!lodash_1.default.has(model, 'type')) {
+            model.type = 'object';
+        }
         // add model label if not set
         if (!lodash_1.default.has(model, 'label')) {
             model.label = lodash_1.default.startCase(modelName);
@@ -196,12 +341,14 @@ function normalizeConfig(config) {
             // 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);
+            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)) {
+        else if (utils_1.isDataModel(model) && gitCMS) {
             updateDataFilePath(model, config);
         }
         if (utils_1.isListDataModel(model)) {
@@ -216,26 +363,17 @@ function normalizeConfig(config) {
         else if (!lodash_1.default.has(model, 'labelField')) {
             utils_1.assignLabelFieldIfNeeded(model);
         }
-        resolveThumbnailPathForModel(model, (_a = model === null || model === void 0 ? void 0 : model.__metadata) === null || _a === void 0 ? void 0 : _a.filePath);
         utils_1.iterateModelFieldsRecursively(model, (field) => {
-            var _a, _b;
             // add field label if label is not set
             if (!lodash_1.default.has(field, 'label')) {
                 field.label = lodash_1.default.startCase(field.name);
             }
             if (utils_1.isListField(field)) {
-                // 'items.type' of list field default to 'string', set it explicitly
-                if (!lodash_1.default.has(field, 'items.type')) {
-                    lodash_1.default.set(field, 'items.type', 'string');
-                }
-                field = utils_1.getListItemsField(field);
+                field = utils_1.normalizeListFieldInPlace(field);
+                field = field.items;
             }
             if (utils_1.isObjectField(field)) {
                 utils_1.assignLabelFieldIfNeeded(field);
-                resolveThumbnailPathForModel(field, (_a = model === null || model === void 0 ? void 0 : model.__metadata) === null || _a === void 0 ? void 0 : _a.filePath);
-            }
-            else if (utils_1.isEnumField(field)) {
-                resolveThumbnailPathForEnumField(field, (_b = model === null || model === void 0 ? void 0 : model.__metadata) === null || _b === void 0 ? void 0 : _b.filePath);
             }
             else if (utils_1.isCustomModelField(field, models)) {
                 // stackbit v0.2.0 compatibility
@@ -266,7 +404,9 @@ function normalizeConfig(config) {
                     field.models = lodash_1.default.get(field, 'models', []);
                 }
             }
-            referencedModelNames = lodash_1.default.union(referencedModelNames, getReferencedModelNames(field));
+            if (gitCMS) {
+                referencedModelNames = lodash_1.default.union(referencedModelNames, getReferencedModelNames(field));
+            }
         });
     });
     lodash_1.default.forEach(referencedModelNames, (modelName) => {
@@ -420,7 +560,7 @@ function resolveThumbnailPath(thumbnail, modelDirPath) {
 function getReferencedModelNames(field) {
     var _a, _b;
     if (utils_1.isListField(field)) {
-        field = utils_1.getListItemsField(field);
+        field = utils_1.getListFieldItems(field);
     }
     // TODO: add type field to model fields inside container update/create object logic rather adding type to schema
     // 'object' models referenced by 'model' fields should have 'type' field
@@ -441,7 +581,9 @@ function validateAndExtendContentModels(config) {
     var _a, _b;
     const contentModels = (_a = config.contentModels) !== null && _a !== void 0 ? _a : {};
     const models = (_b = config.models) !== null && _b !== void 0 ? _b : {};
-    if (lodash_1.default.isEmpty(contentModels)) {
+    const externalModels = !isGitCMS(config);
+    const emptyContentModels = lodash_1.default.isEmpty(contentModels);
+    if (externalModels || emptyContentModels) {
         return {
             valid: true,
             value: config,
@@ -450,16 +592,16 @@ function validateAndExtendContentModels(config) {
     }
     const validationResult = config_validator_1.validateContentModels(contentModels, models);
     if (lodash_1.default.isEmpty(models)) {
-        return validationResult;
+        return {
+            valid: validationResult.valid,
+            value: config,
+            errors: validationResult.errors
+        };
     }
     const extendedModels = lodash_1.default.mapValues(models, (model, modelName) => {
         const contentModel = validationResult.value.contentModels[modelName];
         if (!contentModel) {
-            return {
-                // if a model does not define a type, use the default "object" type
-                type: model.type || 'object',
-                ...lodash_1.default.omit(model, 'type')
-            };
+            return model;
         }
         if (lodash_1.default.get(contentModel, '__metadata.invalid')) {
             return model;
@@ -494,9 +636,41 @@ function validateAndExtendContentModels(config) {
     };
 }
 function normalizeValidationResult(validationResult) {
+    validationResult = filterAndOrderConfigFields(validationResult);
     convertModelGroupsToModelList(validationResult);
     return convertModelsToArray(validationResult);
 }
+function filterAndOrderConfigFields(validationResult) {
+    // TODO: see if we move filtering and sorting to Joi
+    return {
+        ...validationResult,
+        value: lodash_1.default.pick(validationResult.value, [
+            'stackbitVersion',
+            'ssgName',
+            'ssgVersion',
+            'cmsName',
+            'import',
+            'buildCommand',
+            'publishDir',
+            'nodeVersion',
+            'devCommand',
+            'staticDir',
+            'uploadDir',
+            'assets',
+            'pagesDir',
+            'dataDir',
+            'pageLayoutKey',
+            'objectTypeKey',
+            'styleObjectModelName',
+            'excludePages',
+            'logicFields',
+            'contentModels',
+            'modelsSource',
+            'models',
+            'presets'
+        ])
+    };
+}
 function convertModelGroupsToModelList(validationResult) {
     var _a, _b;
     const models = (_b = (_a = validationResult.value) === null || _a === void 0 ? void 0 : _a.models) !== null && _b !== void 0 ? _b : {};
@@ -520,7 +694,7 @@ function convertModelGroupsToModelList(validationResult) {
     lodash_1.default.forEach(models, (model) => {
         utils_1.iterateModelFieldsRecursively(model, (field) => {
             if (utils_1.isListField(field)) {
-                field = utils_1.getListItemsField(field);
+                field = field.items;
             }
             if (field.groups) {
                 let key = null;
@@ -554,6 +728,9 @@ function convertModelsToArray(validationResult) {
             ...yamlModel
         };
     });
+    if (!isGitCMS(config)) {
+        addImageModel(modelArray);
+    }
     const convertedErrors = lodash_1.default.map(validationResult.errors, (error) => {
         if (error.fieldPath[0] === 'models' && typeof error.fieldPath[1] == 'string') {
             const modelName = error.fieldPath[1];
@@ -573,4 +750,19 @@ function convertModelsToArray(validationResult) {
         errors: convertedErrors
     };
 }
+function addImageModel(models) {
+    models.push({
+        type: 'image',
+        name: '__image_model',
+        label: 'Image',
+        labelField: 'title',
+        fields: [
+            { name: 'title', type: 'string' },
+            { name: 'url', type: 'string' }
+        ]
+    });
+}
+function isGitCMS(config) {
+    return !config.cmsName || config.cmsName === 'git';
+}
 //# sourceMappingURL=config-loader.js.map