@stackbit/sdk 0.3.4 → 0.3.6

package/dist/config/config-loader-static.js

@@ -140,7 +140,7 @@ function parseImport(jsConfigString) {
             type,
             contentFile,
             ...utils_1.omitByNil(IMPORT_PROPERTIES.reduce((result, propertyName) => {
-                result[propertyName] = parseInlineProperty(jsConfigString, propertyName);
+                result[propertyName] = parseInlineProperty(importObjectStr, propertyName);
                 return result;
             }, {}))
         };

package/dist/config/config-loader-static.js.map

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

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

@@ -1,6 +1,6 @@
 import { StackbitConfig as RawConfig } from '@stackbit/types';
-import { ConfigLoadError } from './config-errors';
-import { Config } from './config-types';
+import { ConfigLoadError, ConfigValidationError } from './config-errors';
+import { Config, Model } from './config-types';
 export declare const STACKBIT_CONFIG_YAML_FILES: string[];
 export declare const STACKBIT_CONFIG_JS_FILES: string[];
 export declare const STACKBIT_CONFIG_FILES: string[];
@@ -21,15 +21,20 @@ export declare type StopConfigWatch = {
     reload?: () => void;
 };
 export declare type LoadRawConfigResultWithStop = LoadRawConfigResult & StopConfigWatch;
-export declare type LoadRawConfigWithModelsResult = {
-    config?: RawConfig;
-    errors: ConfigLoadError[];
-};
-export declare function loadConfigWithModelsFromDir(dirPath: string): Promise<LoadRawConfigWithModelsResult>;
+export declare function loadStackbitYamlFromDir(dirPath: string): Promise<LoadRawConfigResult>;
 export declare function loadConfigFromStackbitYaml(stackbitYamlPath: string): Promise<LoadRawConfigResult>;
 export declare function findStackbitConfigFile(dirs: string[]): Promise<string | null>;
 export declare function isStackbitYamlFile(filePath: string): boolean;
 export declare function convertToYamlConfig({ config }: {
     config: Config;
 }): RawConfig;
+export declare function loadYamlModelsFromFiles(config: Config): Promise<{
+    models: Model[];
+    errors: ConfigLoadError[];
+}>;
+export declare function getYamlModelDirs(config: Config): string[];
+export declare function mergeConfigModelsWithModelsFromFiles(configModels: Model[], modelsFromFiles: Model[]): {
+    models: Model[];
+    errors: ConfigValidationError[];
+};
 //# sourceMappingURL=config-loader-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config-loader-utils.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,IAAI,SAAS,EAA+B,MAAM,iBAAiB,CAAC;AAE3F,OAAO,EAAE,eAAe,EAA4D,MAAM,iBAAiB,CAAC;AAC5G,OAAO,EAAE,MAAM,EAAkC,MAAM,gBAAgB,CAAC;AAGxE,eAAO,MAAM,0BAA0B,UAAoC,CAAC;AAC5E,eAAO,MAAM,wBAAwB,UAA6F,CAAC;AACnI,eAAO,MAAM,qBAAqB,UAA+D,CAAC;AAClG,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAE/C,oBAAY,kBAAkB,GAAG,SAAS,GAAG;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,oBAAY,mBAAmB,GACzB;IACI,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,IAAI,CAAC;CACf,GACD;IACI,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,eAAe,CAAC;CAC1B,CAAC;AAER,oBAAY,eAAe,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,mBAAmB,GAAG,eAAe,CAAC;AAEhF,oBAAY,6BAA6B,GAAG;IACxC,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC;AAEF,wBAAsB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAsBzG;AAED,wBAAsB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAcvG;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUnF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,WAGlD;AAED,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CA0B7E"}
+{"version":3,"file":"config-loader-utils.d.ts","sourceRoot":"","sources":["../../src/config/config-loader-utils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,IAAI,SAAS,EAAyF,MAAM,iBAAiB,CAAC;AAErJ,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAA4D,MAAM,iBAAiB,CAAC;AACnI,OAAO,EAAE,MAAM,EAAE,KAAK,EAAsC,MAAM,gBAAgB,CAAC;AAGnF,eAAO,MAAM,0BAA0B,UAAoC,CAAC;AAC5E,eAAO,MAAM,wBAAwB,UAA6F,CAAC;AACnI,eAAO,MAAM,qBAAqB,UAA+D,CAAC;AAClG,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAE/C,oBAAY,kBAAkB,GAAG,SAAS,GAAG;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,oBAAY,mBAAmB,GACzB;IACI,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,IAAI,CAAC;CACf,GACD;IACI,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,eAAe,CAAC;CAC1B,CAAC;AAER,oBAAY,eAAe,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,CAAC;AAEF,oBAAY,2BAA2B,GAAG,mBAAmB,GAAG,eAAe,CAAC;AAEhF,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAS3F;AAED,wBAAsB,0BAA0B,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAcvG;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUnF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,WAGlD;AAED,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAsC7E;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,MAAM,EAAE,eAAe,EAAE,CAAA;CAAE,CAAC,CAoDrH;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAQzD;AAcD,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,MAAM,EAAE,qBAAqB,EAAE,CAAA;CAAE,CAoC1J"}

package/dist/config/config-loader-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToYamlConfig = exports.isStackbitYamlFile = exports.findStackbitConfigFile = exports.loadConfigFromStackbitYaml = exports.loadConfigWithModelsFromDir = exports.LATEST_STACKBIT_VERSION = exports.STACKBIT_CONFIG_FILES = exports.STACKBIT_CONFIG_JS_FILES = exports.STACKBIT_CONFIG_YAML_FILES = void 0;
+exports.mergeConfigModelsWithModelsFromFiles = exports.getYamlModelDirs = exports.loadYamlModelsFromFiles = exports.convertToYamlConfig = exports.isStackbitYamlFile = exports.findStackbitConfigFile = exports.loadConfigFromStackbitYaml = exports.loadStackbitYamlFromDir = exports.LATEST_STACKBIT_VERSION = exports.STACKBIT_CONFIG_FILES = exports.STACKBIT_CONFIG_JS_FILES = exports.STACKBIT_CONFIG_YAML_FILES = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
@@ -15,31 +15,17 @@ exports.STACKBIT_CONFIG_YAML_FILES = ['stackbit.yaml', 'stackbit.yml'];
 exports.STACKBIT_CONFIG_JS_FILES = ['stackbit.config.js', 'stackbit.config.cjs', 'stackbit.config.mjs', 'stackbit.config.ts'];
 exports.STACKBIT_CONFIG_FILES = [...exports.STACKBIT_CONFIG_YAML_FILES, ...exports.STACKBIT_CONFIG_JS_FILES];
 exports.LATEST_STACKBIT_VERSION = '0.5.0';
-async function loadConfigWithModelsFromDir(dirPath) {
-    var _a;
+async function loadStackbitYamlFromDir(dirPath) {
     const stackbitYamlPath = await utils_1.getFirstExistingFile(exports.STACKBIT_CONFIG_YAML_FILES, dirPath);
     if (!stackbitYamlPath) {
         return {
-            errors: [new config_errors_1.ConfigLoadError(config_errors_1.STACKBIT_CONFIG_NOT_FOUND)]
-        };
-    }
-    const stackbitYamlResult = await loadConfigFromStackbitYaml(stackbitYamlPath);
-    if (stackbitYamlResult.error) {
-        return {
-            errors: [stackbitYamlResult.error]
+            config: null,
+            error: new config_errors_1.ConfigLoadError(config_errors_1.STACKBIT_CONFIG_NOT_FOUND)
         };
     }
-    const { models: modelsFromFiles, errors: fileModelsErrors } = await loadYamlModelsFromFiles(dirPath, stackbitYamlResult.config);
-    const mergedModels = mergeConfigModelsWithModelsFromFiles((_a = stackbitYamlResult.config.models) !== null && _a !== void 0 ? _a : {}, modelsFromFiles);
-    return {
-        config: {
-            ...stackbitYamlResult.config,
-            models: mergedModels
-        },
-        errors: fileModelsErrors
-    };
+    return await loadConfigFromStackbitYaml(stackbitYamlPath);
 }
-exports.loadConfigWithModelsFromDir = loadConfigWithModelsFromDir;
+exports.loadStackbitYamlFromDir = loadStackbitYamlFromDir;
 async function loadConfigFromStackbitYaml(stackbitYamlPath) {
     const stackbitYaml = await fs_extra_1.default.readFile(stackbitYamlPath, 'utf8');
     const config = js_yaml_1.default.load(stackbitYaml, { schema: js_yaml_1.default.JSON_SCHEMA });
@@ -74,21 +60,33 @@ function isStackbitYamlFile(filePath) {
 }
 exports.isStackbitYamlFile = isStackbitYamlFile;
 function convertToYamlConfig({ config }) {
-    const yamlConfig = lodash_1.default.cloneDeep(lodash_1.default.omit(config, ['models', 'dirPath', 'filePath']));
+    const yamlConfig = lodash_1.default.cloneDeep(lodash_1.default.omit(config, ['models', 'dirPath', 'filePath', 'presets']));
     if (!lodash_1.default.isEmpty(config.models)) {
         yamlConfig.models = lodash_1.default.reduce(config.models, (yamlModels, model) => {
-            if (model.type === 'image') {
-                return yamlModels;
-            }
-            const yamlModel = lodash_1.default.omit(model, ['name', '__metadata']);
-            if (yamlModel.type === 'page' && !yamlModel.hideContent && yamlModel.fields) {
-                lodash_1.default.remove(yamlModel.fields, (field) => field.name === 'markdown_content');
-            }
-            if (yamlModel.type === 'page' && yamlModel.fields) {
-                lodash_1.default.remove(yamlModel.fields, (field) => field.name === (config.pageLayoutKey || 'layout'));
-            }
-            if (yamlModel.type === 'data' && yamlModel.fields) {
-                lodash_1.default.remove(yamlModel.fields, (field) => field.name === (config.objectTypeKey || 'type'));
+            const yamlModel = lodash_1.default.omit(model, ['name', '__metadata', 'presets']);
+            switch (yamlModel.type) {
+                case 'page':
+                    if (!yamlModel.hideContent && yamlModel.fields) {
+                        lodash_1.default.remove(yamlModel.fields, (field) => field.name === 'markdown_content');
+                    }
+                    if (yamlModel.fields) {
+                        lodash_1.default.remove(yamlModel.fields, (field) => field.name === (config.pageLayoutKey || 'layout'));
+                    }
+                    yamlModels[model.name] = yamlModel;
+                    break;
+                case 'data':
+                    if (yamlModel.fields) {
+                        lodash_1.default.remove(yamlModel.fields, (field) => field.name === (config.objectTypeKey || 'type'));
+                    }
+                    break;
+                case 'object':
+                case 'config':
+                    yamlModels[model.name] = yamlModel;
+                    break;
+                default: {
+                    const _exhaustiveCheck = yamlModel;
+                    return _exhaustiveCheck;
+                }
             }
             yamlModels[model.name] = yamlModel;
             return yamlModels;
@@ -97,13 +95,9 @@ function convertToYamlConfig({ config }) {
     return yamlConfig;
 }
 exports.convertToYamlConfig = convertToYamlConfig;
-async function loadYamlModelsFromFiles(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;
+async function loadYamlModelsFromFiles(config) {
+    const dirPath = config.dirPath;
+    const modelDirs = getYamlModelDirs(config);
     const modelFiles = await utils_1.reducePromise(modelDirs, async (modelFiles, modelDir) => {
         const absModelsDir = path_1.default.join(dirPath, modelDir);
         const dirExists = await fs_extra_1.default.pathExists(absModelsDir);
@@ -113,31 +107,48 @@ async function loadYamlModelsFromFiles(dirPath, config) {
         const files = await readYamlModelFilesFromDir(absModelsDir);
         return modelFiles.concat(files.map((filePath) => path_1.default.join(modelDir, filePath)));
     }, []);
-    return utils_1.reducePromise(modelFiles, async (result, modelFile) => {
+    const result = await utils_1.reducePromise(modelFiles, async (result, modelFile) => {
         let model;
         try {
             model = await utils_1.parseFile(path_1.default.join(dirPath, modelFile));
         }
         catch (error) {
             return {
-                models: result.models,
+                modelMap: result.modelMap,
                 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,
+                modelMap: result.modelMap,
                 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
+        result.modelMap[modelName] = {
+            __metadata: {
+                filePath: modelFile
+            },
+            ...model
         };
         return result;
-    }, { models: {}, errors: [] });
+    }, { modelMap: {}, errors: [] });
+    return {
+        models: Object.values(result.modelMap),
+        errors: result.errors
+    };
 }
+exports.loadYamlModelsFromFiles = loadYamlModelsFromFiles;
+function getYamlModelDirs(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 = lodash_1.default.get(modelsSource, 'modelDirs', defaultModelDirs);
+    return sourceType === 'files'
+        ? lodash_1.default.castArray(modelDirs).map((modelDir) => lodash_1.default.trim(modelDir, '/'))
+        : defaultModelDirs;
+}
+exports.getYamlModelDirs = getYamlModelDirs;
 async function readYamlModelFilesFromDir(modelsDir) {
     return await utils_1.readDirRecursively(modelsDir, {
         filter: (filePath, stats) => {
@@ -150,24 +161,26 @@ async function readYamlModelFilesFromDir(modelsDir) {
     });
 }
 function mergeConfigModelsWithModelsFromFiles(configModels, modelsFromFiles) {
-    const mergedModels = lodash_1.default.mapValues(modelsFromFiles, (modelFromFile, modelName) => {
+    const configModelsByName = lodash_1.default.keyBy(configModels, 'name');
+    const mergedModelsFromFiles = modelsFromFiles.map((modelFromFile) => {
         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_2.iterateModelFieldsRecursively(modelFromFile, (field) => {
+        modelFromFile = resolveThumbnailPathForModelOrObjectField(modelFromFile, modelFilePath);
+        modelFromFile = utils_2.mapModelFieldsRecursively(modelFromFile, (field) => {
             if (utils_2.isListField(field)) {
-                field = utils_2.normalizeListFieldInPlace(field);
-                field = field.items;
-            }
-            if (utils_2.isObjectField(field)) {
-                resolveThumbnailPathForModel(field, modelFilePath);
+                field = utils_2.normalizeListField(field);
+                field = {
+                    ...field,
+                    items: resolveThumbnailForEnumField(field.items, modelFilePath)
+                };
             }
-            else if (utils_2.isEnumField(field)) {
-                resolveThumbnailPathForEnumField(field, modelFilePath);
+            else {
+                field = resolveThumbnailForEnumField(field, modelFilePath);
             }
+            return field;
         });
-        const configModel = lodash_1.default.get(configModels, modelName);
+        const configModel = lodash_1.default.get(configModelsByName, modelFromFile.name);
         if (!configModel) {
             return modelFromFile;
         }
@@ -175,26 +188,49 @@ function mergeConfigModelsWithModelsFromFiles(configModels, modelsFromFiles) {
             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);
+    const mergedModels = lodash_1.default.unionBy(mergedModelsFromFiles, configModels, 'name');
+    // 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
+    return utils_2.extendModelArray(mergedModels);
 }
-function resolveThumbnailPathForModel(modelOrField, modelFilePath) {
-    if (modelOrField.type === 'image') {
-        return;
+exports.mergeConfigModelsWithModelsFromFiles = mergeConfigModelsWithModelsFromFiles;
+function resolveThumbnailForEnumField(field, modelFilePath) {
+    if (utils_2.isObjectField(field)) {
+        field = resolveThumbnailPathForModelOrObjectField(field, modelFilePath);
     }
+    else if (utils_2.isEnumField(field)) {
+        field = resolveThumbnailPathForEnumField(field, modelFilePath);
+    }
+    return field;
+}
+function resolveThumbnailPathForModelOrObjectField(modelOrField, modelFilePath) {
     if (modelOrField.thumbnail && modelFilePath) {
         const modelDirPath = path_1.default.dirname(modelFilePath);
-        modelOrField.thumbnail = resolveThumbnailPath(modelOrField.thumbnail, modelDirPath);
+        modelOrField = {
+            ...modelOrField,
+            thumbnail: resolveThumbnailPath(modelOrField.thumbnail, modelDirPath)
+        };
     }
+    return modelOrField;
 }
 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);
-            }
-        });
+        enumField = {
+            ...enumField,
+            options: lodash_1.default.map(enumField.options, (option) => {
+                if (option.thumbnail) {
+                    option = {
+                        ...option,
+                        thumbnail: resolveThumbnailPath(option.thumbnail, modelDirPath)
+                    };
+                }
+                return option;
+            })
+        };
     }
+    return enumField;
 }
 function resolveThumbnailPath(thumbnail, modelDirPath) {
     if (thumbnail.startsWith('//') || /https?:\/\//.test(thumbnail)) {

package/dist/config/config-loader-utils.js.map

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

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

@@ -1,45 +1,64 @@
 import { ModelsSource } from '@stackbit/types';
-import { ConfigError, ConfigLoadError, ConfigPresetsError, ConfigValidationError } from './config-errors';
+import { ConfigValidationResult } from './config-validator';
+import { ConfigError, ConfigLoadError, ConfigValidationError } from './config-errors';
 import { Logger } from '../utils';
 import type { Config, Model } from './config-types';
 import { StopConfigWatch, RawConfigWithPaths } from './config-loader-utils';
-export interface ConfigLoaderOptions {
+export interface ConfigWithModelsPresetsResult {
+    valid: boolean;
+    config: Config | null;
+    errors: ConfigError[];
+}
+export declare function loadConfigWithModelsPresetsAndValidate({ dirPath, modelsSource, stackbitConfigESBuildOutDir, watchCallback, logger }: {
     dirPath: string;
     modelsSource?: ModelsSource;
     stackbitConfigESBuildOutDir?: string;
-    watchCallback?: (result: ConfigLoaderResult) => void;
+    watchCallback?: (result: ConfigWithModelsPresetsResult) => void;
     logger?: Logger;
-}
-export interface ConfigLoaderResult {
-    valid: boolean;
+}): Promise<ConfigWithModelsPresetsResult & StopConfigWatch>;
+export declare type ConfigWithModelsResult = {
     config: Config | null;
-    errors: ConfigError[];
-}
-export declare type ConfigLoaderResultWithStop = ConfigLoaderResult & StopConfigWatch;
-export interface NormalizedValidationResult {
-    valid: boolean;
+    errors: (ConfigLoadError | ConfigValidationError)[];
+};
+export declare function loadConfigWithModels({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
+    dirPath: string;
+    stackbitConfigESBuildOutDir?: string;
+    watchCallback?: (result: ConfigWithModelsResult) => void;
+    logger?: Logger;
+}): Promise<ConfigWithModelsResult & StopConfigWatch>;
+export declare type LoadConfigResult = {
     config: Config;
-    errors: ConfigValidationError[];
-}
-export interface RawConfigLoaderResult {
-    config?: RawConfigWithPaths;
     errors: ConfigLoadError[];
-}
-export declare type RawConfigLoaderResultWithStop = RawConfigLoaderResult & StopConfigWatch;
-export declare function loadConfig({ dirPath, modelsSource, stackbitConfigESBuildOutDir, watchCallback, logger }: ConfigLoaderOptions): Promise<ConfigLoaderResultWithStop>;
-export declare function extendConfig({ config, externalModels }: {
-    config: RawConfigWithPaths;
-    externalModels?: Model[];
-}): Promise<{
-    valid: boolean;
+} | {
+    config: null;
+    errors: ConfigLoadError[];
+};
+export declare function loadConfig({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
+    dirPath: string;
+    stackbitConfigESBuildOutDir?: string;
+    watchCallback?: (result: LoadConfigResult) => void;
+    logger?: Logger;
+}): Promise<LoadConfigResult & StopConfigWatch>;
+export declare function loadAndMergeModelsFromFiles(config: Config): Promise<{
     config: Config;
-    errors: (ConfigValidationError | ConfigPresetsError)[];
+    errors: (ConfigLoadError | ConfigValidationError)[];
 }>;
-export declare function validateAndNormalizeConfig(config: RawConfigWithPaths, externalModels?: Model[]): NormalizedValidationResult;
+export declare function validateAndNormalizeConfig(config: Config): ConfigValidationResult;
+export declare type RawConfigLoaderResult = {
+    config: RawConfigWithPaths;
+    error: null;
+} | {
+    config: null;
+    error: ConfigLoadError;
+};
 export declare function loadConfigFromDir({ dirPath, stackbitConfigESBuildOutDir, watchCallback, logger }: {
     dirPath: string;
     stackbitConfigESBuildOutDir?: string;
-    watchCallback?: (rawConfigResult: RawConfigLoaderResult) => void;
+    watchCallback?: (result: RawConfigLoaderResult) => void;
     logger?: Logger;
-}): Promise<RawConfigLoaderResultWithStop>;
+}): Promise<RawConfigLoaderResult & StopConfigWatch>;
+export declare function mergeConfigModelsWithExternalModels({ configModels, externalModels }: {
+    configModels: Model[];
+    externalModels: Model[];
+}): Model[];
 //# sourceMappingURL=config-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAI3D,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,qBAAqB,EAA6B,MAAM,iBAAiB,CAAC;AAErI,OAAO,EAiBH,MAAM,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAwE,MAAM,gBAAgB,CAAC;AAE1H,OAAO,EAEH,eAAe,EACf,kBAAkB,EAKrB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,oBAAY,0BAA0B,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAE9E,MAAM,WAAW,0BAA0B;IACvC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACnC;AAED,MAAM,WAAW,qBAAqB;IAClC,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,oBAAY,6BAA6B,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAEpF,wBAAsB,UAAU,CAAC,EAC7B,OAAO,EACP,YAAY,EACZ,2BAA2B,EAC3B,aAAa,EACb,MAAM,EACT,EAAE,mBAAmB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAqB3D;AAgCD,wBAAsB,YAAY,CAAC,EAC/B,MAAM,EACN,cAAc,EACjB,EAAE;IACC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,cAAc,CAAC,EAAE,KAAK,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IACR,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,CAAC,qBAAqB,GAAG,kBAAkB,CAAC,EAAE,CAAC;CAC1D,CAAC,CAQD;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,EAAE,cAAc,CAAC,EAAE,KAAK,EAAE,GAAG,0BAA0B,CA8B3H;AAED,wBAAsB,iBAAiB,CAAC,EACpC,OAAO,EACP,2BAA2B,EAC3B,aAAa,EACb,MAAM,EACT,EAAE;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,aAAa,CAAC,EAAE,CAAC,eAAe,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAsHzC"}
+{"version":3,"file":"config-loader.d.ts","sourceRoot":"","sources":["../../src/config/config-loader.ts"],"names":[],"mappings":"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"}