@stackbit/cms-core 1.0.13-develop.1 → 1.0.13-develop.2

package/dist/content-store.js

@@ -83,25 +83,24 @@ class ContentStore {
             argsResolver: ({ nextArgs, prevArgs }) => {
                 // If at least one call had "init: true" then call the deferred
                 // function with "init: true" and without contentSourceIds.
-                const init = nextArgs[0].init || Boolean(prevArgs === null || prevArgs === void 0 ? void 0 : prevArgs[0].init);
+                const init = nextArgs[0].init || Boolean(prevArgs?.[0].init);
                 if (init) {
                     return [{ init }];
                 }
                 // If at least one call had "startWatchingContentUpdates: true" then call the deferred
                 // function with "startWatchingContentUpdates: true".
-                const startWatchingContentUpdates = nextArgs[0].startWatchingContentUpdates || Boolean(prevArgs === null || prevArgs === void 0 ? void 0 : prevArgs[0].startWatchingContentUpdates);
+                const startWatchingContentUpdates = nextArgs[0].startWatchingContentUpdates || Boolean(prevArgs?.[0].startWatchingContentUpdates);
                 // If at least one call had "contentSourceIds: undefined" (signal to reload all content sources)
                 // then call the deferred function with "contentSourceIds: undefined",
                 // otherwise call it with union of content source ids.
                 const contentSourceIds = typeof nextArgs[0].contentSourceIds === 'undefined' || (prevArgs && typeof prevArgs[0].contentSourceIds === 'undefined')
                     ? undefined
-                    : lodash_1.default.union(nextArgs[0].contentSourceIds, prevArgs === null || prevArgs === void 0 ? void 0 : prevArgs[0].contentSourceIds);
+                    : lodash_1.default.union(nextArgs[0].contentSourceIds, prevArgs?.[0].contentSourceIds);
                 return [{ init, startWatchingContentUpdates, contentSourceIds }];
             }
         });
     }
     async init({ stackbitConfig }) {
-        var _a;
         this.logger.debug('init');
         this.stackbitConfig = stackbitConfig;
         if (stackbitConfig) {
@@ -110,14 +109,13 @@ class ContentStore {
             }
             else {
                 this.yamlModels = await this.loadYamlModels({ stackbitConfig });
-                this.configModels = this.mergeConfigModels((_a = stackbitConfig.models) !== null && _a !== void 0 ? _a : [], this.yamlModels);
+                this.configModels = this.mergeConfigModels(stackbitConfig.models ?? [], this.yamlModels);
             }
         }
         await this.loadContentSourcesAndProcessData({ init: true });
         this.contentUpdatesWatchTimer.startTimer();
     }
     async onStackbitConfigChange({ stackbitConfig }) {
-        var _a;
         this.logger.debug('onStackbitConfigChange');
         this.stackbitConfig = stackbitConfig;
         if (stackbitConfig) {
@@ -125,7 +123,7 @@ class ContentStore {
                 this.modelExtensions = stackbitConfig.modelExtensions;
             }
             else {
-                this.configModels = this.mergeConfigModels((_a = stackbitConfig.models) !== null && _a !== void 0 ? _a : [], this.yamlModels);
+                this.configModels = this.mergeConfigModels(stackbitConfig.models ?? [], this.yamlModels);
             }
         }
         await this.loadContentSourcesAndProcessData({ init: true });
@@ -139,9 +137,8 @@ class ContentStore {
      * reducing the CMS API usage.
      */
     handleTimerTimeout() {
-        var _a;
         for (const contentSourceInstance of this.contentSources) {
-            (_a = contentSourceInstance.stopWatchingContentUpdates) === null || _a === void 0 ? void 0 : _a.call(contentSourceInstance);
+            contentSourceInstance.stopWatchingContentUpdates?.();
         }
     }
     /**
@@ -159,18 +156,13 @@ class ContentStore {
         await this.loadContentSourcesAndProcessData({ init: false, startWatchingContentUpdates: true });
     }
     async destroy() {
-        var _a, _b, _c, _d;
         this.contentUpdatesWatchTimer.stopTimer();
-        (_a = this.contentEngine) === null || _a === void 0 ? void 0 : _a.clearListeners();
-        await ((_b = this.contentEngine) === null || _b === void 0 ? void 0 : _b.stop());
-        this.contentEngine = null;
         for (const contentSourceInstance of this.contentSources) {
-            (_c = contentSourceInstance.stopWatchingContentUpdates) === null || _c === void 0 ? void 0 : _c.call(contentSourceInstance);
-            await ((_d = contentSourceInstance.destroy) === null || _d === void 0 ? void 0 : _d.call(contentSourceInstance));
+            contentSourceInstance.stopWatchingContentUpdates?.();
+            await contentSourceInstance.destroy?.();
         }
     }
     async onFilesChange(updatedFiles) {
-        var _a;
         this.logger.debug('onFilesChange');
         if (this.stackbitConfig && !this.stackbitConfig.modelExtensions) {
             // Check if any of the yaml models files were changed. If yaml model files were changed,
@@ -180,7 +172,7 @@ class ContentStore {
             if (yamlModelsChanged) {
                 this.logger.debug('identified change in stackbit model files');
                 this.yamlModels = await this.loadYamlModels({ stackbitConfig: this.stackbitConfig });
-                this.configModels = this.mergeConfigModels((_a = this.stackbitConfig.models) !== null && _a !== void 0 ? _a : [], this.yamlModels);
+                this.configModels = this.mergeConfigModels(this.stackbitConfig.models ?? [], this.yamlModels);
                 this.pushContentSourceEvent({
                     eventName: ContentStoreEventType.YamlModelFilesChange
                 });
@@ -201,7 +193,7 @@ class ContentStore {
         for (const contentSourceInstance of this.contentSources) {
             const contentSourceId = (0, content_store_utils_1.getContentSourceIdForContentSource)(contentSourceInstance);
             const contentSourceData = this.contentSourceDataById[contentSourceId];
-            if (contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.destroyed) {
+            if (contentSourceData?.destroyed) {
                 this.logger.debug(`contentSource '${contentSourceId}' was destroyed, don't call onFilesChange`);
                 continue;
             }
@@ -243,8 +235,7 @@ class ContentStore {
         return configModelsResult.models;
     }
     async loadPresetsFromConfig({ stackbitConfig }) {
-        var _a;
-        const contentSources = (_a = stackbitConfig === null || stackbitConfig === void 0 ? void 0 : stackbitConfig.contentSources) !== null && _a !== void 0 ? _a : [];
+        const contentSources = stackbitConfig?.contentSources ?? [];
         const singleContentSource = contentSources.length === 1 ? contentSources[0] : null;
         const presetResult = await (0, sdk_1.loadPresets)({
             config: stackbitConfig,
@@ -284,32 +275,26 @@ class ContentStore {
      * of these plugin definitions and creates the content engine.
      */
     async createContentEngineIfNeeded() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         const logger = this.userLogger.createLogger({ label: 'content-engine' });
         if (this.contentEngine) {
-            logger.info('stopping content engine');
-            this.contentEngine.clearListeners();
-            await this.contentEngine.stop();
-            this.contentEngine = null;
+            logger.debug(`Content Engine already exists, cannot recreate it as it's running in this process. To recreate it with updated config options the current process must be restarted.`);
+            return;
         }
-        const plugins = Array.from(new Set((_a = this.contentSources) === null || _a === void 0 ? void 0 : _a.flatMap((contentSource) => { var _a, _b; return (_b = (_a = contentSource.getContentEngineConfig) === null || _a === void 0 ? void 0 : _a.call(contentSource)) === null || _b === void 0 ? void 0 : _b.plugins; }).filter(Boolean)));
+        const contentSources = this.contentSources || [];
+        const plugins = Array.from(new Set(contentSources.flatMap((contentSource) => contentSource.getContentEngineConfig?.()?.plugins).filter(Boolean)));
         if (plugins.length < 1) {
             return;
         }
-        logger.info('creating content engine');
+        logger.info('Creating content engine');
         this.contentEngine = (0, content_engine_1.contentEngine)({
-            directory: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.dirPath,
-            port: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.contentEngine) === null || _d === void 0 ? void 0 : _d.port,
-            host: (_f = (_e = this.stackbitConfig) === null || _e === void 0 ? void 0 : _e.contentEngine) === null || _f === void 0 ? void 0 : _f.host,
+            directory: this.stackbitConfig?.dirPath,
+            port: this.stackbitConfig?.contentEngine?.port,
+            host: this.stackbitConfig?.contentEngine?.host,
             engineConfig: {
                 plugins
-            }
-        });
-        (_g = this.contentEngine) === null || _g === void 0 ? void 0 : _g.onStdOut((data) => {
-            logger.info(data.toString());
-        });
-        (_h = this.contentEngine) === null || _h === void 0 ? void 0 : _h.onStdErr((data) => {
-            logger.error(data.toString());
+            },
+            // content engine must run in the same process so that unified connectors can share state in memory
+            runInSubProcess: false
         });
     }
     /**
@@ -330,7 +315,6 @@ class ContentStore {
      * @private
      */
     async loadContentSourcesAndProcessData({ init, startWatchingContentUpdates, contentSourceIds }) {
-        var _a, _b, _c, _d, _e, _f;
         this.logger.debug('loadContentSourcesAndProcessData', { init, contentSourceIds });
         if (this.processingContentSourcesPromise) {
             // for internal monitoring
@@ -340,18 +324,34 @@ class ContentStore {
         // On init, get the new content source instances from the config and wrap them with backward compatibility Proxy.
         // Otherwise, reuse existing proxy wrapped backward compatible content sources.
         const contentSources = init || this.contentSources.length === 0
-            ? ((_b = (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.contentSources) !== null && _b !== void 0 ? _b : []).map((contentSource) => {
+            ? (this.stackbitConfig?.contentSources ?? []).map((contentSource) => {
                 return (0, backward_compatibility_1.backwardCompatibleContentSource)(contentSource);
             })
             : this.contentSources;
         this.contentSources = contentSources;
         if (init) {
             this.logger.debug('init content sources');
+            if (this.stackbitConfig?.connectors) {
+                const contentSources = this.contentSources || [];
+                if (this.stackbitConfig?.connectors?.length) {
+                    const ConnectorWrapper = (await import('./connector/connector-wrapper.mjs')).default;
+                    for (const connector of this.stackbitConfig.connectors) {
+                        contentSources.push(new ConnectorWrapper(connector));
+                    }
+                }
+                this.contentSources = contentSources;
+            }
             await this.createContentEngineIfNeeded();
-            await ((_c = this.contentEngine) === null || _c === void 0 ? void 0 : _c.sync({
-                runServer: true
-            }));
         }
+        const contentEngineSyncPromise = this.contentEngine
+            ? // store the content engine sync promise instead of awaiting here
+                // unified connectors need the internal CSI + source plugin to run simultaneously.
+                // waiting for this promise here means internal unified connector APIs will be stuck forever
+                // it's awaited further below
+                this.contentEngine?.sync({
+                    runServer: true
+                })
+            : Promise.resolve();
         const promises = contentSources.map((contentSourceInstance) => {
             const contentSourceId = (0, content_store_utils_1.getContentSourceIdForContentSource)(contentSourceInstance);
             if (init || !contentSourceIds || contentSourceIds.includes(contentSourceId)) {
@@ -365,7 +365,7 @@ class ContentStore {
         // find first content source that supports presets
         for (let i = 0; i < contentSources.length; i++) {
             const contentSourceDataRaw = contentSourceRawDataArr[i];
-            if ((_d = contentSourceDataRaw === null || contentSourceDataRaw === void 0 ? void 0 : contentSourceDataRaw.csiModelMap) === null || _d === void 0 ? void 0 : _d[consts_1.STACKBIT_PRESET_MODEL_NAME]) {
+            if (contentSourceDataRaw?.csiModelMap?.[consts_1.STACKBIT_PRESET_MODEL_NAME]) {
                 this.presetsContentSource = contentSourceDataRaw.instance;
                 // reload presets from content source only if needed
                 if (init || !contentSourceIds || contentSourceIds.includes(contentSourceDataRaw.id)) {
@@ -381,7 +381,7 @@ class ContentStore {
         // update all content sources at once to prevent race conditions
         this.contentSourceDataById = await this.processData({
             stackbitConfig: this.stackbitConfig,
-            configModels: (_f = (_e = this.modelExtensions) !== null && _e !== void 0 ? _e : this.configModels) !== null && _f !== void 0 ? _f : [],
+            configModels: this.modelExtensions ?? this.configModels ?? [],
             presets: this.presets,
             contentSourceRawDataArr: contentSourceRawDataArr
         });
@@ -407,6 +407,7 @@ class ContentStore {
         this.logger.debug('loadContentSourcesAndProcessData finished', { init, contentSourceIds });
         const processingPromise = this.processingContentSourcesPromise;
         this.processingContentSourcesPromise = null;
+        await contentEngineSyncPromise;
         // Do not "await" on processContentStoreEvents as it may introduce a deadlock with
         // the nested loadContentSourcesAndProcessData call which is wrapped by deferWhileRunning.
         this.processContentStoreEvents()
@@ -535,9 +536,8 @@ class ContentStore {
         });
     }
     async loadContentSourceData({ contentSourceInstance, init, startWatchingContentUpdates }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         const contentSourceId = (0, content_store_utils_1.getContentSourceIdForContentSource)(contentSourceInstance);
-        const contentEngineConfig = (_a = contentSourceInstance.getContentEngineConfig) === null || _a === void 0 ? void 0 : _a.call(contentSourceInstance);
+        const contentEngineConfig = contentSourceInstance.getContentEngineConfig?.();
         this.logger.debug('loadContentSourceData', { contentSourceId, init });
         // clear content source events emitted by this content source because all the content source data is reloaded
         this.clearEventsForContentSourceId(contentSourceId);
@@ -579,7 +579,7 @@ class ContentStore {
         const cache = {
             getSchema: () => {
                 const contentSourceData = getContentSourceDataForCurrentInstance('getSchema');
-                if (!(contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiSchema)) {
+                if (!contentSourceData?.csiSchema) {
                     if (contentSourceData) {
                         const atLine = (0, content_store_utils_1.getErrorAtLine)(1);
                         const errorMessage = `Content source life cycle error! The content source with id '${contentSourceId}' called the 'cache.getSchema' ` +
@@ -592,7 +592,7 @@ class ContentStore {
             },
             getModelByName: (modelName) => {
                 const contentSourceData = getContentSourceDataForCurrentInstance('getModelByName');
-                if (!(contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiModelMap)) {
+                if (!contentSourceData?.csiModelMap) {
                     if (contentSourceData) {
                         const atLine = (0, content_store_utils_1.getErrorAtLine)(1);
                         const errorMessage = `Content source life cycle error! The content source with id '${contentSourceId}' called the 'cache.getModelByName' ` +
@@ -604,34 +604,28 @@ class ContentStore {
                 return contentSourceData.csiModelMap[modelName];
             },
             getDocuments: () => {
-                var _a;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getDocuments');
-                return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiDocuments) !== null && _a !== void 0 ? _a : [];
+                return contentSourceData?.csiDocuments ?? [];
             },
             getDocumentById: (documentId) => {
-                var _a;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getDocumentById');
-                return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiDocumentMap) === null || _a === void 0 ? void 0 : _a[documentId];
+                return contentSourceData?.csiDocumentMap?.[documentId];
             },
             getAssets: () => {
-                var _a;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getAssets');
-                return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiAssets) !== null && _a !== void 0 ? _a : [];
+                return contentSourceData?.csiAssets ?? [];
             },
             getScheduledActions: () => {
-                var _a;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getScheduledActions');
-                return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.scheduledActions) !== null && _a !== void 0 ? _a : [];
+                return contentSourceData?.scheduledActions ?? [];
             },
             getScheduledActionsForDocumentId: (documentId) => {
-                var _a, _b;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getScheduledActionsForDocumentId');
-                return (_b = (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.scheduledActions) === null || _a === void 0 ? void 0 : _a.filter((scheduledAction) => scheduledAction.documentIds.includes(documentId))) !== null && _b !== void 0 ? _b : [];
+                return contentSourceData?.scheduledActions?.filter((scheduledAction) => scheduledAction.documentIds.includes(documentId)) ?? [];
             },
             getAssetById: (assetId) => {
-                var _a;
                 const contentSourceData = getContentSourceDataForCurrentInstance('getAssetById');
-                return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiAssetMap) === null || _a === void 0 ? void 0 : _a[assetId];
+                return contentSourceData?.csiAssetMap?.[assetId];
             },
             updateContent: async (contentChanges) => {
                 if ((0, content_store_utils_1.isContentChangesEmpty)(contentChanges)) {
@@ -642,13 +636,6 @@ class ContentStore {
                     return;
                 }
                 this.logger.debug('content source called updateContent', { contentSourceId });
-                if (contentEngineConfig && this.contentEngine) {
-                    this.logger.debug(`syncing ${contentEngineConfig.connector}`);
-                    await this.contentEngine.sync({
-                        buildSchema: false,
-                        connector: contentEngineConfig.connector
-                    });
-                }
                 this.pushContentSourceEvent({
                     eventName: ContentStoreEventType.ContentSourceContentChange,
                     contentSourceId: contentSourceId,
@@ -705,7 +692,7 @@ class ContentStore {
             if (contentSourceData && contentSourceData.instance !== contentSourceInstance) {
                 this.logger.debug('destroy previous content source instance', { contentSourceId });
                 try {
-                    (_c = (_b = contentSourceData.instance).stopWatchingContentUpdates) === null || _c === void 0 ? void 0 : _c.call(_b);
+                    contentSourceData.instance.stopWatchingContentUpdates?.();
                     await contentSourceData.instance.destroy();
                 }
                 catch (error) {
@@ -735,7 +722,7 @@ class ContentStore {
         const csiModels = csiSchema.models;
         const csiModelMap = lodash_1.default.keyBy(csiModels, 'name');
         const locales = csiSchema.locales;
-        const defaultLocaleCode = (_d = locales === null || locales === void 0 ? void 0 : locales.find((locale) => locale.default)) === null || _d === void 0 ? void 0 : _d.code;
+        const defaultLocaleCode = locales?.find((locale) => locale.default)?.code;
         localCache.csiSchema = csiSchema;
         localCache.csiModels = csiModels;
         localCache.csiModelMap = csiModelMap;
@@ -756,7 +743,7 @@ class ContentStore {
             contentSourceInstance.getScheduledActions);
         try {
             if (scheduledActionsMethodsImplemented) {
-                scheduledActions = (_f = (await ((_e = contentSourceInstance.getScheduledActions) === null || _e === void 0 ? void 0 : _e.call(contentSourceInstance)))) !== null && _f !== void 0 ? _f : [];
+                scheduledActions = (await contentSourceInstance.getScheduledActions?.()) ?? [];
                 localCache.scheduledActions = scheduledActions;
                 enabledScheduledActions = true;
             }
@@ -774,7 +761,7 @@ class ContentStore {
         this.logger.debug('loaded content source data', {
             contentSourceId,
             defaultLocaleCode,
-            localesCount: (_g = locales === null || locales === void 0 ? void 0 : locales.length) !== null && _g !== void 0 ? _g : 0,
+            localesCount: locales?.length ?? 0,
             modelCount: csiModels.length,
             documentCount: csiDocuments.length,
             assetCount: csiAssets.length
@@ -784,21 +771,18 @@ class ContentStore {
             `${csiAssets.length} ${(0, user_log_utils_1.pluralize)('asset', csiAssets.length)}`);
         if (init || startWatchingContentUpdates) {
             // backward compatibility
-            (_h = contentSourceInstance.startWatchingContentUpdates) === null || _h === void 0 ? void 0 : _h.call(contentSourceInstance, {
+            contentSourceInstance.startWatchingContentUpdates?.({
                 getModelMap: () => {
-                    var _a;
                     const contentSourceData = getContentSourceDataForCurrentInstance('getModelMap');
-                    return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiModelMap) !== null && _a !== void 0 ? _a : {};
+                    return contentSourceData?.csiModelMap ?? {};
                 },
                 getDocument: ({ documentId }) => {
-                    var _a;
                     const contentSourceData = getContentSourceDataForCurrentInstance('getDocument');
-                    return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiDocumentMap) === null || _a === void 0 ? void 0 : _a[documentId];
+                    return contentSourceData?.csiDocumentMap?.[documentId];
                 },
                 getAsset: ({ assetId }) => {
-                    var _a;
                     const contentSourceData = getContentSourceDataForCurrentInstance('getAsset');
-                    return (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.csiAssetMap) === null || _a === void 0 ? void 0 : _a[assetId];
+                    return contentSourceData?.csiAssetMap?.[assetId];
                 },
                 onContentChange: cache.updateContent,
                 onSchemaChange: cache.invalidateSchema
@@ -830,16 +814,15 @@ class ContentStore {
         };
     }
     onContentChange(contentSourceId, contentChanges) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         // certain content changes, like preset changes are interpreted as schema changes
         let presetsUpdated = false;
         const contentChangesFull = {
-            documents: (_a = contentChanges.documents) !== null && _a !== void 0 ? _a : [],
-            assets: (_b = contentChanges.assets) !== null && _b !== void 0 ? _b : [],
-            scheduledActions: (_c = contentChanges.scheduledActions) !== null && _c !== void 0 ? _c : [],
-            deletedDocumentIds: (_d = contentChanges.deletedDocumentIds) !== null && _d !== void 0 ? _d : [],
-            deletedAssetIds: (_e = contentChanges.deletedAssetIds) !== null && _e !== void 0 ? _e : [],
-            deletedScheduledActionIds: (_f = contentChanges.deletedScheduledActionIds) !== null && _f !== void 0 ? _f : []
+            documents: contentChanges.documents ?? [],
+            assets: contentChanges.assets ?? [],
+            scheduledActions: contentChanges.scheduledActions ?? [],
+            deletedDocumentIds: contentChanges.deletedDocumentIds ?? [],
+            deletedAssetIds: contentChanges.deletedAssetIds ?? [],
+            deletedScheduledActionIds: contentChanges.deletedScheduledActionIds ?? []
         };
         this.logger.debug('onContentChange', {
             contentSourceId,
@@ -861,10 +844,9 @@ class ContentStore {
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
         // update contentSourceData with deleted documents
         contentChangesFull.deletedDocumentIds.forEach((docId) => {
-            var _a;
             // remove preset, make sure there is something to remove first because
             // were explicitly calling onContentChange from deletePreset as well
-            if (this.presets[docId] && ((_a = contentSourceData.csiDocumentMap[docId]) === null || _a === void 0 ? void 0 : _a.modelName) === consts_1.STACKBIT_PRESET_MODEL_NAME) {
+            if (this.presets[docId] && contentSourceData.csiDocumentMap[docId]?.modelName === consts_1.STACKBIT_PRESET_MODEL_NAME) {
                 presetsUpdated = true;
                 const preset = this.presets[docId];
                 const model = contentSourceData.modelMap[preset.modelName];
@@ -923,7 +905,7 @@ class ContentStore {
         });
         // map csi documents through stackbitConfig.mapDocuments
         let mappedDocs = contentChangesFull.documents;
-        if ((_g = this.stackbitConfig) === null || _g === void 0 ? void 0 : _g.mapDocuments) {
+        if (this.stackbitConfig?.mapDocuments) {
             const csiDocumentsWithSource = contentChangesFull.documents.map((csiDocument) => ({
                 srcType: contentSourceData.srcType,
                 srcProjectId: contentSourceData.srcProjectId,
@@ -937,10 +919,10 @@ class ContentStore {
                 };
             });
             mappedDocs =
-                (_k = (_j = (_h = this.stackbitConfig) === null || _h === void 0 ? void 0 : _h.mapDocuments) === null || _j === void 0 ? void 0 : _j.call(_h, {
+                this.stackbitConfig?.mapDocuments?.({
                     documents: lodash_1.default.cloneDeep(csiDocumentsWithSource),
                     models: lodash_1.default.cloneDeep(modelsWithSource)
-                })) !== null && _k !== void 0 ? _k : csiDocumentsWithSource;
+                }) ?? csiDocumentsWithSource;
         }
         // map csi documents and assets to content store documents and assets
         const documents = (0, csi_to_store_docs_converter_1.mapCSIDocumentsToStoreDocuments)({
@@ -948,7 +930,7 @@ class ContentStore {
             contentSourceInstance: contentSourceData.instance,
             modelMap: contentSourceData.modelMap,
             defaultLocaleCode: contentSourceData.defaultLocaleCode,
-            assetSources: (_m = (_l = this.stackbitConfig) === null || _l === void 0 ? void 0 : _l.assetSources) !== null && _m !== void 0 ? _m : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             customActionRunStateMap: this.customActionRunStateMap,
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
@@ -992,7 +974,7 @@ class ContentStore {
                     this.presets[csiDocument.id] = preset;
                     if (dataIndex === -1) {
                         //TODO recalculate assets as well
-                        (_p = (_o = contentSourceData.modelMap[preset.modelName]) === null || _o === void 0 ? void 0 : _o.presets) === null || _p === void 0 ? void 0 : _p.push(csiDocument.id);
+                        contentSourceData.modelMap[preset.modelName]?.presets?.push(csiDocument.id);
                     }
                 }
             }
@@ -1045,7 +1027,6 @@ class ContentStore {
         };
     }
     async processData({ stackbitConfig, configModels, presets, contentSourceRawDataArr }) {
-        var _a, _b, _c, _d;
         this.logger.debug('processData');
         // Group models from all content sources by their names
         const csiModelGroups = contentSourceRawDataArr.reduce((modelGroups, csData) => {
@@ -1114,10 +1095,9 @@ class ContentStore {
             this.userLogger.warn(configModelMessage + contentSourceModelsMessage);
         }
         const modelsWithSource = contentSourceRawDataArr.reduce((accum, csData) => {
-            var _a;
             const contentSourceId = (0, content_store_utils_1.getContentSourceId)(csData.srcType, csData.srcProjectId);
             const mergedModels = (0, sdk_1.mergeConfigModelsWithExternalModels)({
-                configModels: (_a = configModelsByContentSourceId[contentSourceId]) !== null && _a !== void 0 ? _a : [],
+                configModels: configModelsByContentSourceId[contentSourceId] ?? [],
                 externalModels: csData.csiModels,
                 logger: this.userLogger
             });
@@ -1132,13 +1112,13 @@ class ContentStore {
         }, []);
         // TODO: Is there a better way than deep cloning objects before passing them to user methods?
         //   Not cloning mutable objects will break the internal state if user mutates the objects.
-        const mappedModels = (_b = (_a = stackbitConfig === null || stackbitConfig === void 0 ? void 0 : stackbitConfig.mapModels) === null || _a === void 0 ? void 0 : _a.call(stackbitConfig, { models: lodash_1.default.cloneDeep(modelsWithSource) })) !== null && _b !== void 0 ? _b : modelsWithSource;
+        const mappedModels = stackbitConfig?.mapModels?.({ models: lodash_1.default.cloneDeep(modelsWithSource) }) ?? modelsWithSource;
         const normalizedModels = (0, model_utils_1.normalizeModels)({ models: mappedModels, logger: this.userLogger });
         const validatedModels = (0, model_utils_1.validateModels)({ models: normalizedModels, logger: this.userLogger });
         const modelsWithPresetsIds = (0, sdk_1.extendModelsWithPresetsIds)({ models: validatedModels, presets });
         const { models } = await this.handleConfigAssets({ models: modelsWithPresetsIds });
         let documentMapByContentSource = null;
-        if (stackbitConfig === null || stackbitConfig === void 0 ? void 0 : stackbitConfig.mapDocuments) {
+        if (stackbitConfig?.mapDocuments) {
             const csiDocumentsWithSource = contentSourceRawDataArr.reduce((accum, csData) => {
                 const csiDocumentsWithSource = csData.csiDocuments.map((csiDocument) => ({
                     srcType: csData.srcType,
@@ -1149,15 +1129,14 @@ class ContentStore {
             }, []);
             // TODO: Is there a better way than deep cloning objects before passing them to user methods?
             //   Not cloning mutable objects will break the internal state if user mutates the objects.
-            const mappedDocs = (_d = (_c = stackbitConfig === null || stackbitConfig === void 0 ? void 0 : stackbitConfig.mapDocuments) === null || _c === void 0 ? void 0 : _c.call(stackbitConfig, {
+            const mappedDocs = stackbitConfig?.mapDocuments?.({
                 documents: lodash_1.default.cloneDeep(csiDocumentsWithSource),
                 models: lodash_1.default.cloneDeep(models)
-            })) !== null && _d !== void 0 ? _d : csiDocumentsWithSource;
+            }) ?? csiDocumentsWithSource;
             documentMapByContentSource = (0, content_store_utils_1.groupDocumentsByContentSource)({ documents: mappedDocs });
         }
         const modelMapByContentSource = (0, content_store_utils_1.groupModelsByContentSource)({ models: models });
         const contentSourceDataArr = contentSourceRawDataArr.map((csData) => {
-            var _a, _b;
             const modelMap = lodash_1.default.get(modelMapByContentSource, [csData.srcType, csData.srcProjectId], {});
             const csiDocuments = documentMapByContentSource
                 ? lodash_1.default.get(documentMapByContentSource, [csData.srcType, csData.srcProjectId], [])
@@ -1167,7 +1146,7 @@ class ContentStore {
                 contentSourceInstance: csData.instance,
                 modelMap: modelMap,
                 defaultLocaleCode: csData.defaultLocaleCode,
-                assetSources: (_b = (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.assetSources) !== null && _b !== void 0 ? _b : [],
+                assetSources: this.stackbitConfig?.assetSources ?? [],
                 customActionRunStateMap: this.customActionRunStateMap,
                 createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                     getContentSourceDataById: () => this.contentSourceDataById,
@@ -1188,14 +1167,13 @@ class ContentStore {
     }
     getContentSourceMeta() {
         return lodash_1.default.reduce(this.contentSourceDataById, (result, contentSourceData) => {
-            var _a, _b;
             return result.concat({
                 srcType: contentSourceData.srcType,
                 srcProjectId: contentSourceData.srcProjectId,
                 srcVersion: contentSourceData.version.contentSourceVersion,
                 csiVersion: contentSourceData.version.interfaceVersion,
-                supportsScheduledActions: (_a = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.enabledFeatures.scheduledActions) !== null && _a !== void 0 ? _a : false,
-                supportsDocumentVersions: (_b = contentSourceData === null || contentSourceData === void 0 ? void 0 : contentSourceData.enabledFeatures.documentVersions) !== null && _b !== void 0 ? _b : false
+                supportsScheduledActions: contentSourceData?.enabledFeatures.scheduledActions ?? false,
+                supportsDocumentVersions: contentSourceData?.enabledFeatures.documentVersions ?? false
             });
         }, []);
     }
@@ -1208,14 +1186,13 @@ class ContentStore {
             logger: this.userLogger
         });
         return lodash_1.default.reduce(this.contentSourceDataById, (result, contentSourceData) => {
-            var _a;
             const contentSourceType = contentSourceData.instance.getContentSourceType();
             const srcProjectId = contentSourceData.instance.getProjectId();
             const filteredModels = (0, filtered_entities_1.getContentSourceFilteredModelsForUser)({
                 user,
                 configDelegate,
                 contentSourceData,
-                filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel
+                filterModel: this.stackbitConfig?.filterModel
             });
             const modelsMap = (0, model_utils_1.getModelMap)({ models: filteredModels });
             // if `projectId` is number (even as string) e.g., '1234', _.set() will create an array of length 1235 and insert the item at the end.
@@ -1227,11 +1204,10 @@ class ContentStore {
     }
     getLocales() {
         return lodash_1.default.reduce(this.contentSourceDataById, (result, contentSourceData) => {
-            var _a, _b;
             return result.concat({
                 srcType: contentSourceData.srcType,
                 srcProjectId: contentSourceData.srcProjectId,
-                locales: (_b = (_a = contentSourceData.locales) === null || _a === void 0 ? void 0 : _a.map((locale) => locale.code)) !== null && _b !== void 0 ? _b : [],
+                locales: contentSourceData.locales?.map((locale) => locale.code) ?? [],
                 defaultLocale: contentSourceData.defaultLocaleCode
             });
         }, []);
@@ -1275,9 +1251,8 @@ class ContentStore {
         });
     }
     getPresets({ locale } = {}) {
-        var _a;
         if (!this.presets || !locale) {
-            return (_a = this.presets) !== null && _a !== void 0 ? _a : {};
+            return this.presets ?? {};
         }
         return lodash_1.default.pickBy(this.presets, (preset) => !preset.locale || preset.locale === locale);
     }
@@ -1357,10 +1332,8 @@ class ContentStore {
         };
     }
     getSiteMapEntries({ locale, user } = {}) {
-        var _a;
         const siteMapEntries = lodash_1.default.reduce(this.siteMapEntryGroups, (accum, siteMapEntryGroup) => {
             return lodash_1.default.reduce(siteMapEntryGroup, (accum, siteMapEntry) => {
-                var _a, _b, _c, _d, _e;
                 if (!lodash_1.default.isEmpty(locale)) {
                     // filter out in wrong locale
                     if (siteMapEntry.locale && siteMapEntry.locale !== locale) {
@@ -1370,15 +1343,15 @@ class ContentStore {
                 if ('document' in siteMapEntry) {
                     // check for hidden documents
                     const contentSourceId = (0, content_store_utils_1.getContentSourceId)(siteMapEntry.document.srcType, siteMapEntry.document.srcProjectId);
-                    const document = (_a = (0, content_store_utils_1.getContentSourceDataByIdOrThrow)(contentSourceId, this.contentSourceDataById)) === null || _a === void 0 ? void 0 : _a.documentMap[siteMapEntry.document.id];
+                    const document = (0, content_store_utils_1.getContentSourceDataByIdOrThrow)(contentSourceId, this.contentSourceDataById)?.documentMap[siteMapEntry.document.id];
                     if (document) {
                         const [filteredDocument] = (0, filtered_entities_1.getFilteredDocumentsForUser)({
                             user,
                             documents: [document],
-                            filterModel: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterModel,
-                            filterDocument: (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.filterDocument,
+                            filterModel: this.stackbitConfig?.filterModel,
+                            filterDocument: this.stackbitConfig?.filterDocument,
                             contentSourceDataById: this.contentSourceDataById,
-                            assetSources: (_e = (_d = this.stackbitConfig) === null || _d === void 0 ? void 0 : _d.assetSources) !== null && _e !== void 0 ? _e : [],
+                            assetSources: this.stackbitConfig?.assetSources ?? [],
                             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                                 getContentSourceDataById: () => this.contentSourceDataById,
                                 logger: this.userLogger
@@ -1399,14 +1372,14 @@ class ContentStore {
                     });
                     siteMapEntry = {
                         ...siteMapEntry,
-                        label: fieldLabelValue !== null && fieldLabelValue !== void 0 ? fieldLabelValue : siteMapEntry.urlPath
+                        label: fieldLabelValue ?? siteMapEntry.urlPath
                     };
                 }
                 accum.push(siteMapEntry);
                 return accum;
             }, accum);
         }, []);
-        if (user && ((_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.transformSitemap)) {
+        if (user && this.stackbitConfig?.transformSitemap) {
             const configDelegate = (0, config_delegate_1.createConfigDelegate)({
                 contentSourceDataById: this.contentSourceDataById,
                 logger: this.userLogger
@@ -1416,9 +1389,8 @@ class ContentStore {
         return siteMapEntries;
     }
     getTreeViews({ user } = {}) {
-        var _a;
         let treeViews = this.treeViews;
-        if (((_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.transformTreeViews) && user) {
+        if (this.stackbitConfig?.transformTreeViews && user) {
             const configDelegate = (0, config_delegate_1.createConfigDelegate)({
                 contentSourceDataById: this.contentSourceDataById,
                 logger: this.userLogger
@@ -1428,19 +1400,18 @@ class ContentStore {
         return (0, tree_views_1.removeHiddenTreeViews)({
             treeViews,
             getDocumentForUser: (opts) => {
-                var _a, _b, _c, _d, _e;
                 const contentSourceId = (0, content_store_utils_1.getContentSourceId)(opts.srcType, opts.srcProjectId);
-                const document = (_a = (0, content_store_utils_1.getContentSourceDataByIdOrThrow)(contentSourceId, this.contentSourceDataById)) === null || _a === void 0 ? void 0 : _a.documentMap[opts.srcDocumentId];
+                const document = (0, content_store_utils_1.getContentSourceDataByIdOrThrow)(contentSourceId, this.contentSourceDataById)?.documentMap[opts.srcDocumentId];
                 if (!document || !user) {
                     return document;
                 }
                 const [filteredDocument] = (0, filtered_entities_1.getFilteredDocumentsForUser)({
                     user,
                     documents: [document],
-                    filterModel: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterModel,
-                    filterDocument: (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.filterDocument,
+                    filterModel: this.stackbitConfig?.filterModel,
+                    filterDocument: this.stackbitConfig?.filterDocument,
                     contentSourceDataById: this.contentSourceDataById,
-                    assetSources: (_e = (_d = this.stackbitConfig) === null || _d === void 0 ? void 0 : _d.assetSources) !== null && _e !== void 0 ? _e : [],
+                    assetSources: this.stackbitConfig?.assetSources ?? [],
                     createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                         getContentSourceDataById: () => this.contentSourceDataById,
                         logger: this.userLogger
@@ -1463,7 +1434,6 @@ class ContentStore {
         return lodash_1.default.isEmpty(locale) ? siteMapEntries : siteMapEntries.filter((siteMapEntry) => !siteMapEntry.locale || siteMapEntry.locale === locale);
     }
     getDocument({ srcDocumentId, srcProjectId, srcType, user }) {
-        var _a, _b, _c, _d;
         const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
         const document = contentSourceData.documentMap[srcDocumentId];
@@ -1473,10 +1443,10 @@ class ContentStore {
         const [filteredDocument] = (0, filtered_entities_1.getFilteredDocumentsForUser)({
             user,
             documents: [document],
-            filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel,
-            filterDocument: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterDocument,
+            filterModel: this.stackbitConfig?.filterModel,
+            filterDocument: this.stackbitConfig?.filterDocument,
             contentSourceDataById: this.contentSourceDataById,
-            assetSources: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.assetSources) !== null && _d !== void 0 ? _d : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
                 logger: this.userLogger
@@ -1484,7 +1454,7 @@ class ContentStore {
             logger: this.userLogger,
             customActionRunStateMap: this.customActionRunStateMap
         });
-        return filteredDocument !== null && filteredDocument !== void 0 ? filteredDocument : document;
+        return filteredDocument ?? document;
     }
     getDocumentsByContext({ context, srcProjectId, srcType }) {
         const contentSourcesData = (0, content_store_utils_1.findContentSourcesDataForTypeOrId)({
@@ -1500,7 +1470,6 @@ class ContentStore {
         }, []);
     }
     getDocuments({ locale, user } = {}) {
-        var _a, _b, _c, _d;
         const documents = lodash_1.default.reduce(this.contentSourceDataById, (documents, contentSourceData) => {
             const currentDocuments = lodash_1.default.isEmpty(locale)
                 ? contentSourceData.documents
@@ -1511,10 +1480,10 @@ class ContentStore {
         const filteredDocuments = (0, filtered_entities_1.getFilteredDocumentsForUser)({
             user,
             documents,
-            filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel,
-            filterDocument: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterDocument,
+            filterModel: this.stackbitConfig?.filterModel,
+            filterDocument: this.stackbitConfig?.filterDocument,
             contentSourceDataById: this.contentSourceDataById,
-            assetSources: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.assetSources) !== null && _d !== void 0 ? _d : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
                 logger: this.userLogger
@@ -1525,14 +1494,12 @@ class ContentStore {
         return filteredDocuments;
     }
     getApiDocuments({ documentSpecs, user } = {}) {
-        var _a, _b, _c, _d;
         let filteredDocuments;
-        if (documentSpecs === null || documentSpecs === void 0 ? void 0 : documentSpecs.length) {
+        if (documentSpecs?.length) {
             // filter over documentSpecs
-            filteredDocuments = documentSpecs === null || documentSpecs === void 0 ? void 0 : documentSpecs.reduce((acc, docSpec) => {
-                var _a;
+            filteredDocuments = documentSpecs?.reduce((acc, docSpec) => {
                 const contentSourceId = (0, content_store_utils_1.getContentSourceId)(docSpec.srcType, docSpec.srcProjectId);
-                const document = (_a = this.contentSourceDataById[contentSourceId]) === null || _a === void 0 ? void 0 : _a.documentMap[docSpec.srcDocumentId];
+                const document = this.contentSourceDataById[contentSourceId]?.documentMap[docSpec.srcDocumentId];
                 if (document && document.srcModelName !== consts_1.STACKBIT_PRESET_MODEL_NAME) {
                     acc.push(document);
                 }
@@ -1548,10 +1515,10 @@ class ContentStore {
         filteredDocuments = (0, filtered_entities_1.getFilteredDocumentsForUser)({
             user,
             documents: filteredDocuments,
-            filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel,
-            filterDocument: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterDocument,
+            filterModel: this.stackbitConfig?.filterModel,
+            filterDocument: this.stackbitConfig?.filterDocument,
             contentSourceDataById: this.contentSourceDataById,
-            assetSources: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.assetSources) !== null && _d !== void 0 ? _d : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
                 logger: this.userLogger
@@ -1569,11 +1536,10 @@ class ContentStore {
     }
     getCSIDocuments({ documentSpecs, srcType, srcProjectId, limit = 100, offset = 0 } = {}) {
         // If document specs provided, return the specified documents. Don't use limit or offset.
-        if (documentSpecs === null || documentSpecs === void 0 ? void 0 : documentSpecs.length) {
+        if (documentSpecs?.length) {
             const documents = documentSpecs.reduce((csiDocuments, docSpec) => {
-                var _a;
                 const contentSourceId = (0, content_store_utils_1.getContentSourceId)(docSpec.srcType, docSpec.srcProjectId);
-                const document = (_a = this.contentSourceDataById[contentSourceId]) === null || _a === void 0 ? void 0 : _a.csiDocumentMap[docSpec.srcDocumentId];
+                const document = this.contentSourceDataById[contentSourceId]?.csiDocumentMap[docSpec.srcDocumentId];
                 if (document && document.modelName !== consts_1.STACKBIT_PRESET_MODEL_NAME) {
                     csiDocuments.push(document);
                 }
@@ -1609,7 +1575,6 @@ class ContentStore {
         return contentSourceData.assetMap[srcAssetId];
     }
     getAssets({ locale, user } = {}) {
-        var _a;
         const assets = lodash_1.default.reduce(this.contentSourceDataById, (assets, contentSourceData) => {
             const currentAssets = lodash_1.default.isEmpty(locale)
                 ? contentSourceData.assets
@@ -1619,7 +1584,7 @@ class ContentStore {
         const filteredAssets = (0, filtered_entities_1.getFilteredAssetsForUser)({
             user,
             assets,
-            filterAsset: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterAsset,
+            filterAsset: this.stackbitConfig?.filterAsset,
             contentSourceDataById: this.contentSourceDataById,
             configDelegate: (0, config_delegate_1.createConfigDelegate)({ contentSourceDataById: this.contentSourceDataById, logger: this.userLogger })
         });
@@ -1628,22 +1593,21 @@ class ContentStore {
     getLocalizedApiObjects({ locale, objectIds, user }) {
         const hasExplicitLocale = !lodash_1.default.isEmpty(locale);
         return lodash_1.default.reduce(this.contentSourceDataById, (objects, contentSourceData) => {
-            var _a, _b, _c, _d, _e;
             let documents = objectIds
                 ? contentSourceData.documents.filter((document) => objectIds.includes(document.srcObjectId))
                 : contentSourceData.documents;
             documents = hasExplicitLocale ? documents.filter((document) => !document.locale || document.locale === locale) : documents;
             let assets = objectIds ? contentSourceData.assets.filter((asset) => objectIds.includes(asset.srcObjectId)) : contentSourceData.assets;
             assets = hasExplicitLocale ? assets.filter((asset) => !asset.locale || asset.locale === locale) : assets;
-            const currentLocale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+            const currentLocale = locale ?? contentSourceData.defaultLocaleCode;
             let filteredDocuments = documents.filter((document) => document.srcModelName !== consts_1.STACKBIT_PRESET_MODEL_NAME);
             filteredDocuments = (0, filtered_entities_1.getFilteredDocumentsForUser)({
                 user,
                 documents: filteredDocuments,
-                filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel,
-                filterDocument: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterDocument,
+                filterModel: this.stackbitConfig?.filterModel,
+                filterDocument: this.stackbitConfig?.filterDocument,
                 contentSourceDataById: this.contentSourceDataById,
-                assetSources: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.assetSources) !== null && _d !== void 0 ? _d : [],
+                assetSources: this.stackbitConfig?.assetSources ?? [],
                 createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                     getContentSourceDataById: () => this.contentSourceDataById,
                     logger: this.userLogger
@@ -1654,7 +1618,7 @@ class ContentStore {
             assets = (0, filtered_entities_1.getFilteredAssetsForUser)({
                 user,
                 assets,
-                filterAsset: (_e = this.stackbitConfig) === null || _e === void 0 ? void 0 : _e.filterAsset,
+                filterAsset: this.stackbitConfig?.filterAsset,
                 contentSourceDataById: this.contentSourceDataById,
                 configDelegate: (0, config_delegate_1.createConfigDelegate)({ contentSourceDataById: this.contentSourceDataById, logger: this.userLogger })
             });
@@ -1668,7 +1632,6 @@ class ContentStore {
         }, []);
     }
     getApiAssets({ srcType, srcProjectId, pageSize = 20, pageNum = 1, searchQuery, user } = {}) {
-        var _a;
         let assets;
         if (srcProjectId && srcType) {
             const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
@@ -1676,7 +1639,7 @@ class ContentStore {
             const filteredAssets = (0, filtered_entities_1.getFilteredAssetsForUser)({
                 user,
                 assets: contentSourceData.assets,
-                filterAsset: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterAsset,
+                filterAsset: this.stackbitConfig?.filterAsset,
                 contentSourceDataById: this.contentSourceDataById,
                 configDelegate: (0, config_delegate_1.createConfigDelegate)({ contentSourceDataById: this.contentSourceDataById, logger: this.userLogger })
             });
@@ -1684,11 +1647,10 @@ class ContentStore {
         }
         else {
             assets = lodash_1.default.reduce(this.contentSourceDataById, (result, contentSourceData) => {
-                var _a;
                 const filteredAssets = (0, filtered_entities_1.getFilteredAssetsForUser)({
                     user,
                     assets: contentSourceData.assets,
-                    filterAsset: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterAsset,
+                    filterAsset: this.stackbitConfig?.filterAsset,
                     contentSourceDataById: this.contentSourceDataById,
                     configDelegate: (0, config_delegate_1.createConfigDelegate)({ contentSourceDataById: this.contentSourceDataById, logger: this.userLogger })
                 });
@@ -1725,7 +1687,7 @@ class ContentStore {
         const modelMap = contentSourceData.modelMap;
         const csiModelMap = contentSourceData.csiModelMap;
         // get the 'reference' model field in the updated document that will be used to link the new document
-        locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        locale = locale ?? contentSourceData.defaultLocaleCode;
         const modelField = (0, field_path_utils_1.getModelFieldAtFieldPath)(document, fieldPath, modelMap, locale);
         const csiModelField = (0, field_path_utils_1.getModelFieldAtFieldPath)(document, fieldPath, csiModelMap, locale);
         if (!modelField || !csiModelField) {
@@ -1815,7 +1777,6 @@ class ContentStore {
         return { srcDocumentId: srcDocumentId, createdDocumentId: result.srcDocumentId };
     }
     async createPreset({ preset, thumbnailAsset, user }) {
-        var _a;
         if (!this.presetsContentSource) {
             throw new Error('Error saving preset: No content source available.');
         }
@@ -1827,7 +1788,7 @@ class ContentStore {
                 assets: [thumbnailAsset],
                 user
             });
-            thumbnail = (_a = assets[0]) === null || _a === void 0 ? void 0 : _a.objectId;
+            thumbnail = assets[0]?.objectId;
         }
         const contentSourceData = this.getContentSourceDataByIdOrThrow((0, content_store_utils_1.getContentSourceIdForContentSource)(this.presetsContentSource));
         const document = await this.createDocument({
@@ -1879,7 +1840,7 @@ class ContentStore {
         }
         const csiModelMap = contentSourceData.csiModelMap;
         // get the 'reference' model field in the updated document that will be used to link the new asset
-        locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        locale = locale ?? contentSourceData.defaultLocaleCode;
         const csiModelField = (0, field_path_utils_1.getModelFieldAtFieldPath)(document, fieldPath, csiModelMap, locale);
         if (!csiModelField) {
             throw Error(`Field path not found: '${fieldPath.join('.')}'.`);
@@ -1934,19 +1895,18 @@ class ContentStore {
         return { srcDocumentId: srcDocumentId };
     }
     async createDocument({ srcType, srcProjectId, modelName, object, locale, defaultLocaleDocumentId, user }) {
-        var _a, _b, _c;
         this.logger.debug('createDocument', { srcType, srcProjectId, modelName, locale });
         (0, user_log_utils_1.logCreateDocument)({ userLogger: this.userLogger, srcType, srcProjectId, modelName, locale, object });
         const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
-        const resolvedLocale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        const resolvedLocale = locale ?? contentSourceData.defaultLocaleCode;
         const csiModel = contentSourceData.csiModelMap[modelName];
         if (!csiModel) {
             throw new Error(`Error creating document: model not found: '${modelName}' (source: ${contentSourceId}).`);
         }
-        if ((_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.onContentCreate) {
+        if (this.stackbitConfig?.onContentCreate) {
             object = await this.stackbitConfig.onContentCreate({
-                object: object !== null && object !== void 0 ? object : {},
+                object: object ?? {},
                 locale,
                 model: {
                     srcType: contentSourceData.srcType,
@@ -1966,7 +1926,7 @@ class ContentStore {
             modelName,
             contentSourceId,
             contentSourceDataById: this.contentSourceDataById,
-            assetSources: (_c = (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.assetSources) !== null && _c !== void 0 ? _c : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             createDocument: this.getCreateDocumentThunk({
                 defaultLocaleDocumentId,
                 user
@@ -1994,8 +1954,7 @@ class ContentStore {
             throw new Error(`Error updating document: could not find document model '${documentModelName}'.`);
         }
         const operations = await (0, utils_1.mapPromise)(updateOperations, async (updateOperation) => {
-            var _a, _b, _c, _d, _e;
-            const locale = (_a = updateOperation.locale) !== null && _a !== void 0 ? _a : contentSourceData.defaultLocaleCode;
+            const locale = updateOperation.locale ?? contentSourceData.defaultLocaleCode;
             const modelField = (0, field_path_utils_1.getModelFieldAtFieldPath)(document, updateOperation.fieldPath, modelMap, locale);
             const csiModelField = (0, field_path_utils_1.getModelFieldAtFieldPath)(document, updateOperation.fieldPath, csiModelMap, locale);
             switch (updateOperation.opType) {
@@ -2010,7 +1969,7 @@ class ContentStore {
                         csiModelMap,
                         contentSourceId,
                         contentSourceDataById: this.contentSourceDataById,
-                        assetSources: (_c = (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.assetSources) !== null && _c !== void 0 ? _c : [],
+                        assetSources: this.stackbitConfig?.assetSources ?? [],
                         createDocument: this.getCreateDocumentThunk({ user }),
                         userLogger: this.userLogger
                     });
@@ -2039,7 +1998,7 @@ class ContentStore {
                         csiModelMap,
                         contentSourceId,
                         contentSourceDataById: this.contentSourceDataById,
-                        assetSources: (_e = (_d = this.stackbitConfig) === null || _d === void 0 ? void 0 : _d.assetSources) !== null && _e !== void 0 ? _e : [],
+                        assetSources: this.stackbitConfig?.assetSources ?? [],
                         createDocument: this.getCreateDocumentThunk({ user }),
                         userLogger: this.userLogger
                     }));
@@ -2080,7 +2039,6 @@ class ContentStore {
         return { srcDocumentId: srcDocumentId };
     }
     async duplicateDocument({ srcType, srcProjectId, srcDocumentId, object, locale, user }) {
-        var _a, _b, _c, _d, _e, _f;
         this.logger.debug('duplicateDocument', { srcType, srcProjectId, srcDocumentId, locale });
         (0, user_log_utils_1.logDuplicateDocument)({ userLogger: this.userLogger, srcType, srcProjectId, srcDocumentId, locale });
         const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
@@ -2094,20 +2052,20 @@ class ContentStore {
         if (!model || !csiModel) {
             throw new Error(`Model not found: '${document.srcModelName}' (source: ${contentSourceId})`);
         }
-        const resolvedLocale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        const resolvedLocale = locale ?? contentSourceData.defaultLocaleCode;
         let extendedObject = (0, duplicate_document_1.mergeObjectWithDocument)({
             object,
             document,
             locale: resolvedLocale,
             contentSourceId,
             contentSourceDataById: this.contentSourceDataById,
-            referenceBehavior: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.presetReferenceBehavior,
-            duplicatableModels: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.duplicatableModels,
-            nonDuplicatableModels: (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.nonDuplicatableModels
+            referenceBehavior: this.stackbitConfig?.presetReferenceBehavior,
+            duplicatableModels: this.stackbitConfig?.duplicatableModels,
+            nonDuplicatableModels: this.stackbitConfig?.nonDuplicatableModels
         });
-        if ((_d = this.stackbitConfig) === null || _d === void 0 ? void 0 : _d.onContentCreate) {
+        if (this.stackbitConfig?.onContentCreate) {
             extendedObject = await this.stackbitConfig.onContentCreate({
-                object: extendedObject !== null && extendedObject !== void 0 ? extendedObject : {},
+                object: extendedObject ?? {},
                 locale,
                 model: {
                     srcType: contentSourceData.srcType,
@@ -2127,7 +2085,7 @@ class ContentStore {
             modelName: model.name,
             contentSourceId,
             contentSourceDataById: this.contentSourceDataById,
-            assetSources: (_f = (_e = this.stackbitConfig) === null || _e === void 0 ? void 0 : _e.assetSources) !== null && _f !== void 0 ? _f : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             createDocument: this.getCreateDocumentThunk({ user })
         });
         this.logger.debug('duplicated document', { srcType, srcProjectId, srcDocumentId, newDocumentId: result.documentId, modelName: model.name });
@@ -2159,7 +2117,7 @@ class ContentStore {
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
         const sourceAssets = [];
         const userContext = (0, content_store_utils_1.getUserContextForSrcType)(srcType, user);
-        locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        locale = locale ?? contentSourceData.defaultLocaleCode;
         for (const asset of assets) {
             let base64 = undefined;
             if (asset.data) {
@@ -2260,7 +2218,7 @@ class ContentStore {
         let errors = [];
         for (const [contentSourceId, contentSourceObjects] of Object.entries(objectsBySourceId)) {
             const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
-            locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+            locale = locale ?? contentSourceData.defaultLocaleCode;
             const { documents, assets } = (0, content_store_utils_1.getCSIDocumentsAndAssetsFromContentSourceDataByIds)(contentSourceData, contentSourceObjects);
             const userContext = (0, content_store_utils_1.getUserContextForSrcType)(contentSourceData.srcType, user);
             const internalValidationErrors = internalValidateContent(documents, assets, contentSourceData, locale);
@@ -2301,7 +2259,6 @@ class ContentStore {
         const scheduledActions = [];
         const defaultLocales = {};
         contentSourceIds.forEach((contentSourceId) => {
-            var _a, _b, _c, _d;
             const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
             lodash_1.default.set(schema, [contentSourceData.srcType, contentSourceData.srcProjectId], contentSourceData.modelMap);
             const contentSourceDocuments = lodash_1.default.isEmpty(locale)
@@ -2312,10 +2269,10 @@ class ContentStore {
             const userDocuments = (0, filtered_entities_1.getFilteredDocumentsForUser)({
                 user: data.user,
                 documents: filteredDocuments,
-                filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel,
-                filterDocument: (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.filterDocument,
+                filterModel: this.stackbitConfig?.filterModel,
+                filterDocument: this.stackbitConfig?.filterDocument,
                 contentSourceDataById: this.contentSourceDataById,
-                assetSources: (_d = (_c = this.stackbitConfig) === null || _c === void 0 ? void 0 : _c.assetSources) !== null && _d !== void 0 ? _d : [],
+                assetSources: this.stackbitConfig?.assetSources ?? [],
                 createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                     getContentSourceDataById: () => this.contentSourceDataById,
                     logger: this.userLogger
@@ -2341,10 +2298,9 @@ class ContentStore {
         });
     }
     async getDocumentVersions({ srcType, srcProjectId, documentId, locale, user }) {
-        var _a, _b, _c;
         const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
-        locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        locale = locale ?? contentSourceData.defaultLocaleCode;
         this.logger.debug('getDocumentVersions', { srcType, srcProjectId, documentId });
         if (!contentSourceData.instance.getDocumentVersions) {
             this.logger.error('Trying to call getDocumentVersions, but it is not implemented', {
@@ -2362,10 +2318,10 @@ class ContentStore {
                 contentSourceDataById: this.contentSourceDataById,
                 logger: this.userLogger
             }),
-            filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel
+            filterModel: this.stackbitConfig?.filterModel
         });
         const apiVersions = (0, csi_to_api_docs_converter_1.mapDocumentVersionsToApiDocumentVersions)({
-            assetSources: (_c = (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.assetSources) !== null && _c !== void 0 ? _c : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             customActionRunStateMap: this.customActionRunStateMap,
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
@@ -2380,10 +2336,9 @@ class ContentStore {
         return { versions: apiVersions };
     }
     async getDocumentForVersion({ srcType, srcProjectId, documentId, versionId, locale, user }) {
-        var _a, _b, _c;
         const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
         const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
-        locale = locale !== null && locale !== void 0 ? locale : contentSourceData.defaultLocaleCode;
+        locale = locale ?? contentSourceData.defaultLocaleCode;
         this.logger.debug('getDocumentForVersion', { srcType, srcProjectId, documentId, versionId });
         if (!contentSourceData.instance.getDocumentForVersion) {
             this.logger.error('Trying to call getDocumentForVersion, but it is not implemented', {
@@ -2402,11 +2357,11 @@ class ContentStore {
                 contentSourceDataById: this.contentSourceDataById,
                 logger: this.userLogger
             }),
-            filterModel: (_a = this.stackbitConfig) === null || _a === void 0 ? void 0 : _a.filterModel
+            filterModel: this.stackbitConfig?.filterModel
         });
         const [apiVersion] = (0, csi_to_api_docs_converter_1.mapDocumentVersionsToApiDocumentVersions)({
             versions: [version],
-            assetSources: (_c = (_b = this.stackbitConfig) === null || _b === void 0 ? void 0 : _b.assetSources) !== null && _c !== void 0 ? _c : [],
+            assetSources: this.stackbitConfig?.assetSources ?? [],
             customActionRunStateMap: this.customActionRunStateMap,
             createConfigDelegate: (0, config_delegate_1.getCreateConfigDelegateThunk)({
                 getContentSourceDataById: () => this.contentSourceDataById,
@@ -2452,11 +2407,22 @@ class ContentStore {
     getContentSourceDataByIdOrThrow(contentSourceId) {
         return (0, content_store_utils_1.getContentSourceDataByIdOrThrow)(contentSourceId, this.contentSourceDataById);
     }
-    onWebhook({ srcType, srcProjectId, data, headers }) {
-        var _a, _b;
-        const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
-        const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
-        return (_b = (_a = contentSourceData.instance).onWebhook) === null || _b === void 0 ? void 0 : _b.call(_a, { data, headers });
+    async onWebhook({ srcType, srcProjectId, data, headers }) {
+        if (this.contentEngine) {
+            // if there's a content-engine always pass the webhook body to it
+            await this.contentEngine.sync({
+                webhookBody: data,
+                // selective connector syncing can happen via a header
+                connector: headers?.connector
+            });
+        }
+        // unified connectors handle their own webhook syncing via the .sync call above.
+        // passing "connector" as the source type in the webhook url opts out of traditional CSI onWebhook calls
+        if (srcType !== `connector`) {
+            const contentSourceId = (0, content_store_utils_1.getContentSourceId)(srcType, srcProjectId);
+            const contentSourceData = this.getContentSourceDataByIdOrThrow(contentSourceId);
+            return contentSourceData.instance.onWebhook?.({ data, headers });
+        }
     }
     getWebhookUrl(contentSourceType, projectId) {
         if (!this.webhookUrl) {