@stackbit/sdk 0.2.39 → 0.3.1

package/dist/config/config-loader.js

@@ -25,28 +25,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigFromDir = exports.validateAndNormalizeConfig = exports.extendConfig = exports.loadConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const js_yaml_1 = __importDefault(require("js-yaml"));
+const chokidar_1 = __importDefault(require("chokidar"));
 const semver_1 = __importDefault(require("semver"));
 const lodash_1 = __importDefault(require("lodash"));
+const utils_1 = require("@stackbit/utils");
 const config_validator_1 = require("./config-validator");
 const config_errors_1 = require("./config-errors");
 const config_loader_esbuild_1 = require("./config-loader-esbuild");
-const utils_1 = require("../utils");
-const utils_2 = require("@stackbit/utils");
+const utils_2 = require("../utils");
 const presets_loader_1 = require("./presets-loader");
-async function loadConfig({ dirPath, modelsSource, stackbitConfigESBuildOutDir, watchCallback }) {
+const config_loader_utils_1 = require("./config-loader-utils");
+async function loadConfig({ dirPath, modelsSource, stackbitConfigESBuildOutDir, watchCallback, logger }) {
+    let wrappedCallback;
+    if (watchCallback) {
+        wrappedCallback = async (rawConfigResult) => {
+            const configLoaderResult = await processConfigLoaderResult({ rawConfigResult, dirPath, modelsSource });
+            watchCallback(configLoaderResult);
+        };
+    }
     const rawConfigResult = await loadConfigFromDir({
         dirPath,
         stackbitConfigESBuildOutDir,
-        watchCallback: watchCallback
-            ? async (rawConfigResult) => {
-                const configLoaderResult = await processConfigLoaderResult({ rawConfigResult, dirPath, modelsSource });
-                watchCallback(configLoaderResult);
-            }
-            : undefined
+        watchCallback: wrappedCallback,
+        logger
     });
     const configLoaderResult = await processConfigLoaderResult({ rawConfigResult, dirPath, modelsSource });
-    return Object.assign(configLoaderResult, { stop: rawConfigResult.stop });
+    return Object.assign(configLoaderResult, {
+        stop: rawConfigResult.stop,
+        reload: rawConfigResult.reload
+    });
 }
 exports.loadConfig = loadConfig;
 async function processConfigLoaderResult({ rawConfigResult, dirPath, modelsSource }) {
@@ -59,16 +66,16 @@ async function processConfigLoaderResult({ rawConfigResult, dirPath, modelsSourc
         };
     }
     const { models: externalModels, errors: externalModelsLoadErrors } = await loadModelsFromExternalSource(config, dirPath, modelsSource);
-    const extendedConfig = await extendConfig({ dirPath, config, externalModels });
+    const extendedConfig = await extendConfig({ config, externalModels });
     return {
         valid: extendedConfig.valid,
         config: extendedConfig.config,
         errors: [...configLoadErrors, ...externalModelsLoadErrors, ...extendedConfig.errors]
     };
 }
-async function extendConfig({ dirPath, config, externalModels }) {
+async function extendConfig({ config, externalModels }) {
     const normalizedResult = validateAndNormalizeConfig(config, externalModels);
-    const presetsResult = await presets_loader_1.loadPresets(dirPath, normalizedResult.config);
+    const presetsResult = await presets_loader_1.loadPresets(config.dirPath, normalizedResult.config);
     return {
         valid: normalizedResult.valid,
         config: presetsResult.config,
@@ -80,7 +87,7 @@ function validateAndNormalizeConfig(config, externalModels) {
     // extend config models having the "extends" property
     // 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: extendedModels, errors: extendModelErrors } = utils_1.extendModelMap(config.models);
+    const { models: extendedModels, errors: extendModelErrors } = utils_2.extendModelMap(config.models);
     const extendedConfig = {
         ...config,
         models: extendedModels
@@ -102,25 +109,71 @@ function validateAndNormalizeConfig(config, externalModels) {
     });
 }
 exports.validateAndNormalizeConfig = validateAndNormalizeConfig;
-async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCallback }) {
-    var _a;
+async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }) {
     // try to load stackbit config from YAML files
     try {
-        const stackbitYamlPath = path_1.default.join(dirPath, 'stackbit.yaml');
-        const stackbitYamlExists = await fs_extra_1.default.pathExists(stackbitYamlPath);
-        if (stackbitYamlExists) {
-            const stackbitYamlResult = await loadConfigFromStackbitYaml(stackbitYamlPath);
-            if (stackbitYamlResult.error) {
-                return { errors: [stackbitYamlResult.error] };
+        const stackbitYamlPath = await utils_1.getFirstExistingFile(config_loader_utils_1.STACKBIT_CONFIG_YAML_FILES, dirPath);
+        if (stackbitYamlPath) {
+            const { config, errors } = await config_loader_utils_1.loadConfigWithModelsFromDir(dirPath);
+            let close = async () => void 0;
+            let reload = () => void 0;
+            let stopped = false;
+            if (watchCallback) {
+                const watcher = chokidar_1.default.watch([...config_loader_utils_1.STACKBIT_CONFIG_YAML_FILES, '.stackbit'], {
+                    cwd: dirPath,
+                    persistent: true,
+                    ignoreInitial: true
+                });
+                const throttledFileChange = lodash_1.default.throttle(async () => {
+                    const { config, errors } = await config_loader_utils_1.loadConfigWithModelsFromDir(dirPath);
+                    watchCallback({
+                        config: config
+                            ? {
+                                ...config,
+                                dirPath: dirPath,
+                                filePath: stackbitYamlPath
+                            }
+                            : undefined,
+                        errors
+                    });
+                }, 1000);
+                const handleFileChange = (path) => {
+                    logger === null || logger === void 0 ? void 0 : logger.debug(`identified change in stackbit config file: ${path}, reloading config...`);
+                    throttledFileChange();
+                };
+                watcher.on('add', handleFileChange);
+                watcher.on('change', handleFileChange);
+                watcher.on('unlink', handleFileChange);
+                watcher.on('addDir', handleFileChange);
+                watcher.on('unlinkDir', handleFileChange);
+                watcher.on('error', (error) => {
+                    watchCallback({
+                        errors: [new config_errors_1.ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
+                    });
+                });
+                close = async () => {
+                    if (stopped) {
+                        return;
+                    }
+                    stopped = true;
+                    throttledFileChange.cancel();
+                    watcher.close();
+                };
+                reload = () => {
+                    throttledFileChange();
+                };
             }
-            const { models: modelsFromFiles, errors: fileModelsErrors } = await loadModelsFromFiles(dirPath, stackbitYamlResult.config);
-            const mergedModels = mergeConfigModelsWithModelsFromFiles((_a = stackbitYamlResult.config.models) !== null && _a !== void 0 ? _a : {}, modelsFromFiles);
             return {
-                config: {
-                    ...stackbitYamlResult.config,
-                    models: mergedModels
-                },
-                errors: fileModelsErrors
+                config: config
+                    ? {
+                        ...config,
+                        dirPath: dirPath,
+                        filePath: stackbitYamlPath
+                    }
+                    : undefined,
+                stop: close,
+                reload: reload,
+                errors: errors
             };
         }
     }
@@ -129,7 +182,7 @@ async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCa
             errors: [new config_errors_1.ConfigLoadError(`Error loading Stackbit configuration: ${error.message}`, { originalError: error })]
         };
     }
-    function wrapResult(result) {
+    function wrapResult(result, configFilePath) {
         if (result.error) {
             return {
                 errors: [result.error]
@@ -137,26 +190,31 @@ async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCa
         }
         else {
             return {
-                config: result.config,
+                config: {
+                    ...result.config,
+                    dirPath: dirPath,
+                    filePath: configFilePath
+                },
                 errors: []
             };
         }
     }
     // try to load stackbit config from JavaScript files
     try {
-        const configFilePath = await utils_2.getFirstExistingFile(['stackbit.config.js', 'stackbit.config.cjs', 'stackbit.config.mjs', 'stackbit.config.ts'], dirPath);
+        const configFilePath = await utils_1.getFirstExistingFile(config_loader_utils_1.STACKBIT_CONFIG_JS_FILES, dirPath);
         if (configFilePath) {
             const configResult = await config_loader_esbuild_1.loadStackbitConfigFromJs({
                 configPath: configFilePath,
-                outDir: stackbitConfigESBuildOutDir,
+                outDir: stackbitConfigESBuildOutDir !== null && stackbitConfigESBuildOutDir !== void 0 ? stackbitConfigESBuildOutDir : '.stackbit/cache',
                 watch: !!watchCallback,
+                logger: logger,
                 callback: watchCallback
                     ? (result) => {
-                        watchCallback(wrapResult(result));
+                        watchCallback(wrapResult(result, configFilePath));
                     }
                     : undefined
             });
-            return Object.assign(wrapResult(configResult), { stop: configResult.stop });
+            return Object.assign(wrapResult(configResult, configFilePath), { stop: configResult.stop });
         }
     }
     catch (error) {
@@ -165,79 +223,15 @@ async function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCa
         };
     }
     return {
-        errors: [
-            new config_errors_1.ConfigLoadError('stackbit.yaml or stackbit.config.js was not found, please refer Stackbit documentation: https://www.stackbit.com/docs/stackbit-yaml/')
-        ]
+        errors: [new config_errors_1.ConfigLoadError(config_errors_1.STACKBIT_CONFIG_NOT_FOUND)]
     };
 }
 exports.loadConfigFromDir = loadConfigFromDir;
-async function loadConfigFromStackbitYaml(stackbitYamlPath) {
-    const stackbitYaml = await fs_extra_1.default.readFile(stackbitYamlPath);
-    const config = js_yaml_1.default.load(stackbitYaml.toString('utf8'), { schema: js_yaml_1.default.JSON_SCHEMA });
-    if (!config || typeof config !== 'object') {
-        return {
-            error: new config_errors_1.ConfigLoadError('error parsing stackbit.yaml, please refer Stackbit documentation: https://www.stackbit.com/docs/stackbit-yaml/')
-        };
-    }
-    return { config };
-}
-async function loadModelsFromFiles(dirPath, config) {
-    const modelsSource = lodash_1.default.get(config, 'modelsSource', {});
-    const sourceType = lodash_1.default.get(modelsSource, 'type', 'files');
-    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}`))
-            };
-        }
-        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, {
-        filter: (filePath, stats) => {
-            if (stats.isDirectory()) {
-                return true;
-            }
-            const extension = path_1.default.extname(filePath).substring(1);
-            return stats.isFile() && ['yaml', 'yml'].includes(extension);
-        }
-    });
-}
 async function loadModelsFromExternalSource(config, dirPath, modelsSource) {
-    modelsSource = lodash_1.default.assign({}, modelsSource, config.modelSource);
+    modelsSource = lodash_1.default.assign({}, modelsSource, config.modelsSource);
     const sourceType = lodash_1.default.get(modelsSource, 'type', 'files');
     if (sourceType === 'files') {
-        // we already loaded models from files inside loadModelsFromFiles function
+        // we already loaded models from files inside loadConfigFromDir function
         return { models: [], errors: [] };
     }
     else if (sourceType === 'contentful') {
@@ -291,34 +285,6 @@ 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) {
@@ -341,12 +307,12 @@ function mergeConfigWithExternalModels(config, externalModels) {
         }
         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({
+        externalModel = Object.assign({}, externalModel, lodash_1.default.pick(stackbitModel, ['__metadata', 'label', 'description', 'thumbnail', 'singleInstance', 'readOnly', 'labelField', 'fieldGroups']), utils_1.omitByNil({
             type: modelType,
             urlPath
         }));
-        externalModel = utils_1.mapModelFieldsRecursively(externalModel, (externalField, modelKeyPath) => {
-            const stackbitField = utils_1.getModelFieldForModelKeyPath(stackbitModel, modelKeyPath);
+        externalModel = utils_2.mapModelFieldsRecursively(externalModel, (externalField, modelKeyPath) => {
+            const stackbitField = utils_2.getModelFieldForModelKeyPath(stackbitModel, modelKeyPath);
             if (!stackbitField) {
                 return externalField;
             }
@@ -384,8 +350,12 @@ function normalizeConfig(config) {
     const stackbitYamlVersion = String(lodash_1.default.get(config, 'stackbitVersion', ''));
     const ver = semver_1.default.coerce(stackbitYamlVersion);
     const isStackbitYamlV2 = ver ? semver_1.default.satisfies(ver, '<0.3.0') : false;
+    const isStackbitYamlV5 = ver ? semver_1.default.satisfies(ver, '>=0.5.0') : false;
     const models = (config === null || config === void 0 ? void 0 : config.models) || {};
     const gitCMS = isGitCMS(config);
+    utils_1.rename(config, 'logicFields', 'noEncodeFields');
+    config.hcrHandled = !stackbitYamlVersion || lodash_1.default.get(config, 'customContentReload', lodash_1.default.get(config, 'hcrHandled', !isStackbitYamlV5));
+    config.internalStackbitRunnerOptions = getInternalStackbitRunnerOptions(config);
     lodash_1.default.forEach(models, (model, modelName) => {
         if (!model) {
             return;
@@ -400,54 +370,54 @@ function normalizeConfig(config) {
         if (lodash_1.default.has(model, 'fields') && !Array.isArray(model.fields)) {
             model.fields = [];
         }
-        if (utils_1.isPageModel(model)) {
+        if (utils_2.isPageModel(model)) {
             // rename old 'template' property to 'layout'
-            utils_2.rename(model, 'template', 'layout');
+            utils_1.rename(model, 'template', 'layout');
             updatePageUrlPath(model);
             if (gitCMS) {
                 updatePageFilePath(model, config);
                 addMarkdownContentField(model);
             }
         }
-        else if (utils_1.isDataModel(model) && gitCMS) {
+        else if (utils_2.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)) {
+            if (utils_2.isPageModel(model)) {
                 addLayoutFieldToPageModel(model, pageLayoutKey, modelName);
             }
-            else if (utils_1.isDataModel(model) && !utils_1.isListDataModel(model)) {
+            else if (utils_2.isDataModel(model) && !utils_2.isListDataModel(model)) {
                 addObjectTypeKeyField(model, objectTypeKey, modelName);
             }
         }
-        if (utils_1.isListDataModel(model)) {
+        if (utils_2.isListDataModel(model)) {
             // 'items.type' of list model defaults to 'string', set it explicitly
             if (!lodash_1.default.has(model, 'items.type')) {
                 lodash_1.default.set(model, 'items.type', 'string');
             }
-            if (utils_1.isObjectListItems(model.items)) {
-                utils_1.assignLabelFieldIfNeeded(model.items);
+            if (utils_2.isObjectListItems(model.items)) {
+                utils_2.assignLabelFieldIfNeeded(model.items);
             }
         }
         else if (!lodash_1.default.has(model, 'labelField')) {
-            utils_1.assignLabelFieldIfNeeded(model);
+            utils_2.assignLabelFieldIfNeeded(model);
         }
-        utils_1.iterateModelFieldsRecursively(model, (field) => {
+        utils_2.iterateModelFieldsRecursively(model, (field) => {
             // 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)) {
-                field = utils_1.normalizeListFieldInPlace(field);
+            if (utils_2.isListField(field)) {
+                field = utils_2.normalizeListFieldInPlace(field);
                 field = field.items;
             }
-            if (utils_1.isObjectField(field)) {
-                utils_1.assignLabelFieldIfNeeded(field);
+            if (utils_2.isObjectField(field)) {
+                utils_2.assignLabelFieldIfNeeded(field);
             }
-            else if (utils_1.isCustomModelField(field, models)) {
+            else if (utils_2.isCustomModelField(field, models)) {
                 // stackbit v0.2.0 compatibility
                 // convert the old custom model field type: { type: 'action' }
                 // to the new 'model' field type: { type: 'model', models: ['action'] }
@@ -470,7 +440,7 @@ function normalizeConfig(config) {
             }
             if (isStackbitYamlV2) {
                 // in stackbit.yaml v0.2.x, the 'reference' field was what we have today as 'model' field:
-                if (utils_1.isReferenceField(field)) {
+                if (utils_2.isReferenceField(field)) {
                     field = field;
                     field.type = 'model';
                     field.models = lodash_1.default.get(field, 'models', []);
@@ -540,7 +510,7 @@ function addMarkdownContentField(model) {
     if (hasMarkdownContent) {
         return;
     }
-    utils_2.append(model, 'fields', {
+    utils_1.append(model, 'fields', {
         type: 'markdown',
         name: 'markdown_content',
         label: 'Content',
@@ -559,7 +529,7 @@ function addLayoutFieldToPageModel(model, pageLayoutKey, modelName) {
     if (hasLayoutField) {
         return;
     }
-    utils_2.prepend(model, 'fields', {
+    utils_1.prepend(model, 'fields', {
         type: 'string',
         name: pageLayoutKey,
         label: lodash_1.default.startCase(pageLayoutKey),
@@ -572,7 +542,7 @@ function addObjectTypeKeyField(model, objectTypeKey, modelName) {
     if (hasObjectTypeField) {
         return;
     }
-    utils_2.prepend(model, 'fields', {
+    utils_1.prepend(model, 'fields', {
         type: 'string',
         name: objectTypeKey,
         label: 'Object Type',
@@ -581,37 +551,6 @@ function addObjectTypeKeyField(model, objectTypeKey, modelName) {
         hidden: true
     });
 }
-function resolveThumbnailPathForModel(modelOrField, modelFilePath) {
-    if (modelOrField.thumbnail && modelFilePath) {
-        const modelDirPath = path_1.default.dirname(modelFilePath);
-        modelOrField.thumbnail = resolveThumbnailPath(modelOrField.thumbnail, modelDirPath);
-    }
-}
-function resolveThumbnailPathForEnumField(enumField, modelFilePath) {
-    if (enumField.controlType === 'thumbnails' && modelFilePath) {
-        const modelDirPath = path_1.default.dirname(modelFilePath);
-        lodash_1.default.forEach(enumField.options, (option) => {
-            if (option.thumbnail) {
-                option.thumbnail = resolveThumbnailPath(option.thumbnail, modelDirPath);
-            }
-        });
-    }
-}
-function resolveThumbnailPath(thumbnail, modelDirPath) {
-    if (thumbnail.startsWith('//') || /https?:\/\//.test(thumbnail)) {
-        return thumbnail;
-    }
-    if (thumbnail.startsWith('/')) {
-        if (modelDirPath.endsWith('@stackbit/components/models')) {
-            modelDirPath = modelDirPath.replace(/\/models$/, '');
-        }
-        else {
-            modelDirPath = '';
-        }
-        thumbnail = thumbnail.replace(/^\//, '');
-    }
-    return path_1.default.join(modelDirPath, thumbnail);
-}
 /**
  * Returns model names referenced by polymorphic 'model' and 'reference' fields.
  * That is, fields that can hold objects of different types.
@@ -620,19 +559,19 @@ function resolveThumbnailPath(thumbnail, modelDirPath) {
  */
 function getReferencedModelNames(field) {
     var _a, _b;
-    if (utils_1.isListField(field)) {
-        field = utils_1.getListFieldItems(field);
+    if (utils_2.isListField(field)) {
+        field = utils_2.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
     // if these fields have than 1 model.
     // 'data' models referenced by 'reference' fields should always have 'type' field.
     let referencedModelNames = [];
-    if (utils_1.isModelField(field) && ((_a = field.models) === null || _a === void 0 ? void 0 : _a.length) > 1) {
+    if (utils_2.isModelField(field) && ((_a = field.models) === null || _a === void 0 ? void 0 : _a.length) > 1) {
         const modelNames = field.models;
         referencedModelNames = lodash_1.default.union(referencedModelNames, modelNames);
     }
-    else if (utils_1.isReferenceField(field) && ((_b = field.models) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+    else if (utils_2.isReferenceField(field) && ((_b = field.models) === null || _b === void 0 ? void 0 : _b.length) > 0) {
         const modelNames = field.models;
         referencedModelNames = lodash_1.default.union(referencedModelNames, modelNames);
     }
@@ -702,7 +641,7 @@ function normalizeValidationResult(validationResult) {
     return convertModelsToArray(validationResult);
 }
 function filterAndOrderConfigFields(validationResult) {
-    // TODO: see if we move filtering and sorting to Joi
+    // TODO: check if we can move filtering and sorting to Joi
     return {
         ...validationResult,
         value: lodash_1.default.pick(validationResult.value, [
@@ -714,6 +653,9 @@ function filterAndOrderConfigFields(validationResult) {
             'buildCommand',
             'publishDir',
             'nodeVersion',
+            'postGitCloneCommand',
+            'preInstallCommand',
+            'postInstallCommand',
             'devCommand',
             'staticDir',
             'uploadDir',
@@ -728,11 +670,29 @@ function filterAndOrderConfigFields(validationResult) {
             'contentModels',
             'presetSource',
             'modelsSource',
+            'mapModels',
+            'presetReferenceBehavior',
+            'nonDuplicatableModels',
+            'duplicatableModels',
+            'contentSources',
+            'hcrHandled',
+            'internalStackbitRunnerOptions',
+            'dirPath',
+            'filePath',
             'models',
-            'presets'
+            'presets',
+            'pageData',
+            'pageModels',
+            'encodedFieldTypes',
+            'noEncodeFields',
+            'omitFields' // obsolete, left for backward compatibility
         ])
     };
 }
+/**
+ * Collects models groups and injects them into the `models` array of the
+ * `reference` and `model` field types
+ */
 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 : {};
@@ -742,7 +702,7 @@ function convertModelGroupsToModelList(validationResult) {
         }
         const key = (model === null || model === void 0 ? void 0 : model.type) === 'object' ? 'objectModels' : 'documentModels';
         lodash_1.default.forEach(model.groups, (groupName) => {
-            utils_2.append(groupMap, [groupName, key], modelName);
+            utils_1.append(groupMap, [groupName, key], modelName);
         });
         delete model.groups;
         return groupMap;
@@ -754,16 +714,16 @@ function convertModelGroupsToModelList(validationResult) {
         });
     });
     lodash_1.default.forEach(models, (model) => {
-        utils_1.iterateModelFieldsRecursively(model, (field) => {
-            if (utils_1.isListField(field)) {
+        utils_2.iterateModelFieldsRecursively(model, (field) => {
+            if (utils_2.isListField(field)) {
                 field = field.items;
             }
             if (field.groups) {
                 let key = null;
-                if (utils_1.isModelField(field)) {
+                if (utils_2.isModelField(field)) {
                     key = 'objectModels';
                 }
-                else if (utils_1.isReferenceField(field)) {
+                else if (utils_2.isReferenceField(field)) {
                     key = 'documentModels';
                 }
                 if (key) {
@@ -778,12 +738,12 @@ function convertModelGroupsToModelList(validationResult) {
     });
 }
 function convertModelsToArray(validationResult) {
-    var _a;
     const config = validationResult.value;
+    const { stackbitVersion = config_loader_utils_1.LATEST_STACKBIT_VERSION, models, ...rest } = config;
     // in stackbit.yaml 'models' are defined as object where keys are the model names,
     // convert 'models' to array of objects and set their 'name' property to the
     // model name
-    const modelMap = (_a = config.models) !== null && _a !== void 0 ? _a : {};
+    const modelMap = models !== null && models !== void 0 ? models : {};
     const modelArray = lodash_1.default.map(modelMap, (yamlModel, modelName) => {
         return {
             name: modelName,
@@ -806,7 +766,8 @@ function convertModelsToArray(validationResult) {
     return {
         valid: validationResult.valid,
         config: {
-            ...config,
+            stackbitVersion,
+            ...rest,
             models: modelArray
         },
         errors: convertedErrors
@@ -825,6 +786,21 @@ function addImageModel(models) {
     });
 }
 function isGitCMS(config) {
-    return !config.cmsName || config.cmsName === 'git';
+    return !config.contentSources && (!config.cmsName || config.cmsName === 'git');
+}
+function getInternalStackbitRunnerOptions(config) {
+    const experimentalSsgData = lodash_1.default.get(config, 'experimental.ssg');
+    if (!experimentalSsgData) {
+        return lodash_1.default.get(config, '__unsafe_internal_stackbitRunnerOptions');
+    }
+    const doneStart = lodash_1.default.get(experimentalSsgData, 'logPatterns.up');
+    return {
+        displayName: experimentalSsgData.name || 'ssg',
+        triggerInstallFiles: lodash_1.default.get(experimentalSsgData, 'watch.reinstallPackages', ['package.json', 'package-lock.json']),
+        directPaths: experimentalSsgData.passthrough || [],
+        patterns: {
+            doneStart: lodash_1.default.isEmpty(doneStart) || lodash_1.default.isArray(doneStart) ? doneStart : [doneStart]
+        }
+    };
 }
 //# sourceMappingURL=config-loader.js.map