@stackbit/cms-core 0.1.26-gitcms.3 → 0.1.26-gitcms.5

package/dist/utils/store-to-csi-docs-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store-to-csi-docs-converter.d.ts","sourceRoot":"","sources":["../../src/utils/store-to-csi-docs-converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAC;AAE5D,wBAAgB,yCAAyC,CAAC,SAAS,EAAE,iBAAiB,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAEhI"}
+{"version":3,"file":"store-to-csi-docs-converter.d.ts","sourceRoot":"","sources":["../../src/utils/store-to-csi-docs-converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,iBAAiB,MAAM,UAAU,CAAC;AAE9C,wBAAgB,yCAAyC,CAAC,SAAS,EAAE,iBAAiB,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,kBAAkB,EAAE,CAEhI"}

package/dist/utils/store-to-csi-docs-converter.js

@@ -83,6 +83,8 @@ function mapStoreFieldToCSIField(documentField) {
                 return {
                     type: 'image',
                     localized: true,
+                    source: documentField.source,
+                    sourceData: documentField.sourceData,
                     locales: lodash_1.default.mapValues(documentField.locales, (locale) => ({
                         locale: locale.locale,
                         fields: mapStoreFieldsToCSIFields(locale.fields)
@@ -94,6 +96,8 @@ function mapStoreFieldToCSIField(documentField) {
             }
             return {
                 type: 'image',
+                source: documentField.source,
+                sourceData: documentField.sourceData,
                 fields: mapStoreFieldsToCSIFields(documentField.fields)
             };
         }

package/dist/utils/store-to-csi-docs-converter.js.map

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

package/dist/utils/timer.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from '../content-store-types';
+import { Logger } from '@stackbit/types';
 export declare class Timer {
     private readonly timerCallback;
     private readonly timerMs;

package/dist/utils/timer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/utils/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,OAAO,CAAwB;gBAE3B,EAAE,aAAa,EAAE,OAAwB,EAAE,MAAM,EAAE,EAAE;QAAE,aAAa,EAAE,MAAM,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAQjI,SAAS;IAIT,UAAU;IAIV,UAAU;IAKV,SAAS;IAOT,aAAa;CAKhB"}
+{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../src/utils/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IACjC,OAAO,CAAC,OAAO,CAAwB;gBAE3B,EAAE,aAAa,EAAE,OAAwB,EAAE,MAAM,EAAE,EAAE;QAAE,aAAa,EAAE,MAAM,IAAI,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAQjI,SAAS;IAIT,UAAU;IAIV,UAAU;IAKV,SAAS;IAOT,aAAa;CAKhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackbit/cms-core",
-  "version": "0.1.26-gitcms.3",
+  "version": "0.1.26-gitcms.5",
   "description": "stackbit-dev",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,9 +31,9 @@
     "@babel/parser": "^7.11.5",
     "@babel/traverse": "^7.11.5",
     "@iarna/toml": "^2.2.3",
-    "@stackbit/sdk": "^0.3.19-gitcms.0",
-    "@stackbit/types": "^0.1.11-gitcms.0",
-    "@stackbit/utils": "^0.2.18-gitcms.0",
+    "@stackbit/sdk": "^0.3.19-gitcms.2",
+    "@stackbit/types": "0.1.11-gitcms.1",
+    "@stackbit/utils": "0.2.18-gitcms.1",
     "chalk": "^4.0.1",
     "esm": "^3.2.25",
     "fs-extra": "^8.1.0",
@@ -48,5 +48,5 @@
     "slugify": "^1.6.5",
     "uuid": "^9.0.0"
   },
-  "gitHead": "a69fb6a5977ddbdf25933de935055bd808e8eb1d"
+  "gitHead": "d9661d9b1f0c111d80e97b8871b7823117549bdf"
 }

package/src/content-store-utils.ts

@@ -3,8 +3,7 @@ import { Model } from '@stackbit/sdk';
 import { append } from '@stackbit/utils';
 import { Field, FieldList, FieldListItems, FieldListProps, FieldObjectProps, FieldSpecificProps, FieldType, UpdateOperationValueField } from '@stackbit/types';
 import * as CSITypes from '@stackbit/types';
-import * as ContentStoreTypes from './content-store-types';
-import { CrossReferenceData } from './content-store-types';
+import * as ContentStoreTypes from './types';
 
 export function getContentSourceIdForContentSource(contentSource: CSITypes.ContentSourceInterface): string {
     return getContentSourceId(contentSource.getContentSourceType(), contentSource.getProjectId());
@@ -19,16 +18,18 @@ export function getUserContextForSrcType(srcType: string, user?: ContentStoreTyp
         return user;
     }
     const connection = user?.connections?.find((connection) => connection.type === srcType);
-    if (connection) {
-        return connection;
-    }
     return {
         email: user.email,
-        name: user.name
+        name: user.name,
+        ...connection
     };
 }
 
-export function getDocumentFieldForLocale<Type extends ContentStoreTypes.FieldType>(
+export function isDocumentFieldOneOfFieldTypes<T extends FieldType>(documentField: ContentStoreTypes.DocumentField, fieldTypes: ReadonlyArray<T>): documentField is ContentStoreTypes.DocumentFieldForType<T> {
+    return fieldTypes.includes(documentField.type as T);
+}
+
+export function getDocumentFieldForLocale<Type extends FieldType>(
     docField: ContentStoreTypes.DocumentFieldForType<Type>,
     locale?: string
 ): ContentStoreTypes.DocumentFieldNonLocalizedForType<Type> | null {
@@ -41,10 +42,10 @@ export function getDocumentFieldForLocale<Type extends ContentStoreTypes.FieldTy
         if (!localizedField) {
             return null;
         }
-        return ({
+        return {
             ...base,
             ...localizedField
-        } as unknown) as ContentStoreTypes.DocumentFieldNonLocalizedForType<Type>;
+        } as unknown as ContentStoreTypes.DocumentFieldNonLocalizedForType<Type>;
     } else {
         return docField;
     }
@@ -204,9 +205,9 @@ export function getCSIDocumentsAndAssetsFromContentSourceDataByIds(
     };
 }
 
-export function updateOperationValueFieldWithCrossReference(type: 'string' | 'text' | 'json', refObject: CrossReferenceData): UpdateOperationValueField {
+export function updateOperationValueFieldWithCrossReference(type: 'string' | 'text' | 'json' | 'cross-reference', refObject: ContentStoreTypes.CrossReferenceData): UpdateOperationValueField {
     return {
         type,
-        value: type === 'json' ? refObject : JSON.stringify(refObject)
+        value: (type === 'json' || type === 'cross-reference') ? refObject : JSON.stringify(refObject)
     };
 }

package/src/content-store.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import sanitizeFilename from 'sanitize-filename';
 
 import * as CSITypes from '@stackbit/types';
-import { getLocalizedFieldForLocale, ModelExtension, UserCommandSpawner } from '@stackbit/types';
+import { getLocalizedFieldForLocale, isOneOfFieldTypes, ModelExtension, UserCommandSpawner } from '@stackbit/types';
 import {
     Config,
     extendModelsWithPresetsIds,
@@ -20,7 +20,7 @@ import {
 } from '@stackbit/sdk';
 import { append, deferWhileRunning, mapPromise, reducePromise } from '@stackbit/utils';
 
-import * as ContentStoreTypes from './content-store-types';
+import * as ContentStoreTypes from './types';
 import { Timer } from './utils/timer';
 import { SearchFilter } from './types/search-filter';
 import { searchDocuments } from './utils/search-utils';
@@ -48,17 +48,19 @@ import { mergeObjectWithDocument } from './utils/duplicate-document';
 import { normalizeModels, validateModels } from './utils/model-utils';
 import { IMAGE_MODEL } from './common/common-schema';
 import { getDocumentObjectFromPreset, getPresetFromDocument } from './utils/preset-utils';
-import { ContentSourceServices } from '@stackbit/types';
+import { GitService } from './services';
+import { CommandRunner } from '@stackbit/types';
 
 export type HandleConfigAssets = <T extends Model>({ models, presets }: { models?: T[]; presets?: PresetMap }) => Promise<{ models: T[]; presets: PresetMap }>;
 
 export interface ContentSourceOptions {
-    logger: ContentStoreTypes.Logger;
-    userLogger: ContentStoreTypes.Logger;
+    logger: CSITypes.Logger;
+    userLogger: CSITypes.Logger;
     localDev: boolean;
     staticAssetsPublicPath: string;
     webhookUrl?: string;
-    contentSourceServices: ContentSourceServices;
+    runCommand: CommandRunner;
+    git: GitService;
     userCommandSpawner?: UserCommandSpawner; //TODO remove
     onSchemaChangeCallback: () => void;
     onContentChangeCallback: (contentChanges: ContentStoreTypes.ContentChangeResult) => void;
@@ -72,13 +74,14 @@ type ContentSourceRawData = Omit<ContentSourceData, 'models' | 'modelMap' | 'doc
 export const StackbitPresetModelName = 'stackbitPreset';
 
 export class ContentStore {
-    private readonly logger: ContentStoreTypes.Logger;
-    private readonly userLogger: ContentStoreTypes.Logger;
+    private readonly logger: CSITypes.Logger;
+    private readonly userLogger: CSITypes.Logger;
     private readonly userCommandSpawner?: UserCommandSpawner;
     private readonly localDev: boolean;
     private readonly staticAssetsPublicPath: string;
     private readonly webhookUrl?: string;
-    private readonly contentSourceServices: ContentSourceServices;
+    private readonly runCommand: CommandRunner;
+    private readonly git: GitService;
     private readonly onSchemaChangeCallback: () => void;
     private readonly onContentChangeCallback: (contentChanges: ContentStoreTypes.ContentChangeResult) => void;
     private readonly handleConfigAssets: HandleConfigAssets;
@@ -100,7 +103,8 @@ export class ContentStore {
         this.localDev = options.localDev;
         this.staticAssetsPublicPath = options.staticAssetsPublicPath;
         this.webhookUrl = options.webhookUrl;
-        this.contentSourceServices = options.contentSourceServices;
+        this.runCommand = options.runCommand;
+        this.git = options.git;
         this.userCommandSpawner = options.userCommandSpawner;
         this.onSchemaChangeCallback = options.onSchemaChangeCallback;
         this.onContentChangeCallback = options.onContentChangeCallback;
@@ -438,9 +442,8 @@ export class ContentStore {
                 localDev: this.localDev,
                 webhookUrl: this.getWebhookUrl(contentSourceInstance.getContentSourceType(), contentSourceInstance.getProjectId()),
                 devAppRestartNeeded: this.devAppRestartNeeded,
-                delegate: {
-                    services: this.contentSourceServices
-                }
+                runCommand: this.runCommand,
+                git: this.git
             });
         } else {
             contentSourceInstance.stopWatchingContentUpdates();
@@ -491,7 +494,7 @@ export class ContentStore {
                 }
                 this.logger.debug('content source called onContentChange.', { contentSourceId });
                 const result = this.onContentChange(contentSourceId, contentChangeEvent);
-                
+
                 this.siteMapEntryGroups = await updateSiteMapEntriesWithContentChanges({
                     siteMapEntryGroups: this.siteMapEntryGroups,
                     contentChanges: result,
@@ -1126,7 +1129,7 @@ export class ContentStore {
         return _.reduce(
             this.contentSourceDataById,
             (objects: ContentStoreTypes.APIObject[], contentSourceData) => {
-                let documents = objectIds 
+                let documents = objectIds
                     ? contentSourceData.documents.filter((document) => objectIds.includes(document.srcObjectId))
                     : contentSourceData.documents;
                 documents = hasExplicitLocale
@@ -1140,8 +1143,8 @@ export class ContentStore {
                     : assets;
                 const currentLocale = locale ?? contentSourceData.defaultLocaleCode;
                 const filteredDocuments = documents.filter((document) => document.srcModelName !== StackbitPresetModelName);
-                const documentObjects = mapDocumentsToLocalizedApiObjects(filteredDocuments, this.staticAssetsPublicPath, currentLocale);
-                const imageObjects = mapAssetsToLocalizedApiImages(assets, this.staticAssetsPublicPath, currentLocale);
+                const documentObjects = mapDocumentsToLocalizedApiObjects(filteredDocuments, currentLocale);
+                const imageObjects = mapAssetsToLocalizedApiImages(assets, currentLocale);
                 return objects.concat(documentObjects, imageObjects);
             },
             []
@@ -1293,10 +1296,10 @@ export class ContentStore {
                 refId: result.srcDocumentId
             } as CSITypes.UpdateOperationReferenceField;
         } else {
-            if (!['string', 'text', 'json'].includes(csiFieldProps.type)) {
+            if (!isOneOfFieldTypes(csiFieldProps.type, ['string', 'text', 'json', 'cross-reference'])) {
                 throw new Error(`The 'cross-reference' field can be only applied on string, text and json fields: ${fieldPath.join('.')}`);
             }
-            field = updateOperationValueFieldWithCrossReference(csiFieldProps.type as 'string' | 'text' | 'json', {
+            field = updateOperationValueFieldWithCrossReference(csiFieldProps.type, {
                 refId: result.srcDocumentId,
                 refSrcType: refSrcType,
                 refProjectId: refProjectId

package/src/index.ts

@@ -6,7 +6,7 @@ export * as consts from './consts';
 export * from './common/common-schema';
 export * from './common/common-types';
 export * from './content-store';
-export * as ContentStoreTypes from './content-store-types';
+export * as ContentStoreTypes from './types';
 export { default as encodeData } from './encoder';
 export * from './encoder';
 export * from './types/search-filter';

package/src/services/git.ts

@@ -4,11 +4,11 @@ import path from 'path';
 import { v4 as uuid } from 'uuid';
 import fse from 'fs-extra';
 
-import { GitServiceInterface, GitFileObject, GitAuthor, GitCommitLogEntry, Logger } from '@stackbit/types';
+import { GitServiceInterface, GitFileCommitDescriptor, GitAuthor, GitCommitLogEntry, Logger } from '@stackbit/types';
 import { Worker } from '@stackbit/utils';
 
-import { RunService } from './run';
 import { DocumentStatus } from '@stackbit/types';
+import { CommandRunner } from '@stackbit/types';
 
 const GIT_LOG_CHANGE_TYPES: Record<string, DocumentStatus> = {
     M: 'modified',
@@ -22,7 +22,7 @@ export class GitService implements GitServiceInterface {
     private readonly repoBranch: string;
     private readonly repoPublishBranch: string;
     private readonly worker: Worker;
-    private readonly run: RunService;
+    private readonly runCommand: CommandRunner;
     private readonly logger: Logger;
     private readonly userLogger: Logger;
 
@@ -34,7 +34,7 @@ export class GitService implements GitServiceInterface {
         repoBranch: string;
         repoPublishBranch: string;
         worker: Worker;
-        runService: RunService;
+        runCommand: CommandRunner;
         logger: Logger;
         userLogger: Logger;
     }) {
@@ -43,12 +43,12 @@ export class GitService implements GitServiceInterface {
         this.repoBranch = options.repoBranch;
         this.repoPublishBranch = options.repoPublishBranch;
         this.worker = options.worker;
-        this.run = options.runService;
+        this.runCommand = options.runCommand;
         this.logger = options.logger;
         this.userLogger = options.userLogger;
     }
 
-    private async commit(author: GitAuthor, files: GitFileObject[]) {
+    private async commit(author: GitAuthor, files: GitFileCommitDescriptor[]) {
         const filePaths = _.map(files, 'filePath');
         this.logger.debug('[git] Commit scheduled', filePaths);
         return this.worker.schedule(async () => {
@@ -59,12 +59,10 @@ export class GitService implements GitServiceInterface {
                     return messages;
                 }, [])
                 .join('.\n');
-            await this.run.command('git', ['add', ...filePaths], this.repoDir);
-            await this.run.command(
-                'git',
-                ['commit', '--no-verify', '--author', `${author.name || author.email} <${author.email}>`, '-m', message],
-                this.repoDir
-            );
+            await this.runCommand('git', ['add', ...filePaths], { cwd: this.repoDir });
+            await this.runCommand('git', ['commit', '--no-verify', '--author', `${author.name || author.email} <${author.email}>`, '-m', message], {
+                cwd: this.repoDir
+            });
             this.logger.debug('[git] Commit done', filePaths);
         });
     }
@@ -73,23 +71,23 @@ export class GitService implements GitServiceInterface {
         this.logger.debug('[git] Push scheduled');
         return this.worker.schedule(async () => {
             this.logger.debug('[git] Push running');
-            await this.run.command('rm', ['-rf', '.git/rebase-merge'], this.repoDir).catch((err) => {}); // fixes leftover rebase directory with autostash
-            await this.run.command('git', ['pull', 'origin', this.repoBranch, '--rebase', '--autostash', '-Xtheirs'], this.repoDir);
-            await this.run.command('git', ['push', 'origin', this.repoBranch], this.repoDir);
+            await this.runCommand('rm', ['-rf', '.git/rebase-merge'], { cwd: this.repoDir }).catch((err) => {}); // fixes leftover rebase directory with autostash
+            await this.runCommand('git', ['pull', 'origin', this.repoBranch, '--rebase', '--autostash', '-Xtheirs'], { cwd: this.repoDir });
+            await this.runCommand('git', ['push', 'origin', this.repoBranch], { cwd: this.repoDir });
             this.logger.debug('[git] Push done');
         });
     }
 
-    async commitAndPush(author: GitAuthor, files: GitFileObject[]) {
+    async commitAndPush(author: GitAuthor, files: GitFileCommitDescriptor[]): Promise<void> {
         await this.commit(author, files);
         return this.push();
     }
 
-    pull() {
+    pull(): Promise<void> {
         this.logger.debug('[git] Pull scheduled');
         return this.worker.schedule(async () => {
             this.logger.debug('[git] Pull running');
-            await this.run.command('git', ['pull', 'origin', '--rebase', '--autostash', '-Xtheirs'], this.repoDir);
+            await this.runCommand('git', ['pull', 'origin', '--rebase', '--autostash', '-Xtheirs'], { cwd: this.repoDir });
             this.logger.debug('[git] Pull done');
         });
     }
@@ -97,13 +95,13 @@ export class GitService implements GitServiceInterface {
     private async publishAll(author: GitAuthor) {
         this.logger.debug('[git] Publish all started');
         const publishDir = path.join(os.tmpdir(), uuid());
-        await this.run.command('git', ['clone', this.repoUrl, '--branch', this.repoPublishBranch, publishDir]);
+        await this.runCommand('git', ['clone', this.repoUrl, '--branch', this.repoPublishBranch, publishDir]);
         try {
-            await this.run.command('git', ['merge', `origin/${this.repoBranch}`, this.repoPublishBranch, '-Xtheirs'], publishDir);
-            await this.run
-                .command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir)
-                .catch(() => {});
-            await this.run.command('git', ['push', 'origin'], publishDir);
+            await this.runCommand('git', ['merge', `origin/${this.repoBranch}`, this.repoPublishBranch, '-Xtheirs'], { cwd: publishDir });
+            await this.runCommand('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], {
+                cwd: publishDir
+            }).catch(() => {});
+            await this.runCommand('git', ['push', 'origin'], { cwd: publishDir });
         } finally {
             await fse.remove(publishDir);
         }
@@ -113,7 +111,7 @@ export class GitService implements GitServiceInterface {
     private async publishFiles(author: GitAuthor, filePaths: string[]) {
         this.logger.debug('[git] Publish files started', filePaths);
         const publishDir = path.join(os.tmpdir(), uuid());
-        await this.run.command('git', ['clone', this.repoUrl, '--branch', this.repoPublishBranch, publishDir]);
+        await this.runCommand('git', ['clone', this.repoUrl, '--branch', this.repoPublishBranch, publishDir]);
         try {
             await Promise.all(
                 filePaths.map(async (filePath) => {
@@ -123,21 +121,21 @@ export class GitService implements GitServiceInterface {
                 })
             );
 
-            await this.run.command('git', ['checkout', '-b', 'stackbit-publish-branch'], publishDir);
-            await this.run.command('git', ['add', ...filePaths], publishDir);
-            await this.run
-                .command('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], publishDir)
-                .catch((err) => {
-                    return;
-                });
+            await this.runCommand('git', ['checkout', '-b', 'stackbit-publish-branch'], { cwd: publishDir });
+            await this.runCommand('git', ['add', ...filePaths], { cwd: publishDir });
+            await this.runCommand('git', ['commit', '--author', `${author.name || author.email} <${author.email}>`, `-m`, 'Publish'], {
+                cwd: publishDir
+            }).catch((err) => {
+                return;
+            });
 
-            await this.run.command('git', ['checkout', this.repoBranch], publishDir);
-            await this.run.command('git', ['merge', 'stackbit-publish-branch', this.repoBranch, '-Xtheirs'], publishDir);
+            await this.runCommand('git', ['checkout', this.repoBranch], { cwd: publishDir });
+            await this.runCommand('git', ['merge', 'stackbit-publish-branch', this.repoBranch, '-Xtheirs'], { cwd: publishDir });
 
-            await this.run.command('git', ['checkout', this.repoPublishBranch], publishDir);
-            await this.run.command('git', ['merge', 'stackbit-publish-branch', this.repoPublishBranch, '-Xtheirs'], publishDir);
+            await this.runCommand('git', ['checkout', this.repoPublishBranch], { cwd: publishDir });
+            await this.runCommand('git', ['merge', 'stackbit-publish-branch', this.repoPublishBranch, '-Xtheirs'], { cwd: publishDir });
 
-            await this.run.command('git', ['push', 'origin', this.repoPublishBranch, this.repoBranch], publishDir);
+            await this.runCommand('git', ['push', 'origin', this.repoPublishBranch, this.repoBranch], { cwd: publishDir });
         } finally {
             await fse.remove(publishDir);
         }
@@ -180,7 +178,7 @@ export class GitService implements GitServiceInterface {
         this.logger.debug('[git] Diff check scheduled');
         return this.worker.schedule(async () => {
             this.logger.debug('[git] Diff check running');
-            const result = await this.run.command(
+            const result = await this.runCommand(
                 'git',
                 [
                     'diff',
@@ -188,7 +186,7 @@ export class GitService implements GitServiceInterface {
                     '--no-renames', // this flag makes sure we get both old and new name of renamed file
                     `origin/${this.repoPublishBranch}..${this.repoBranch}`
                 ],
-                this.repoDir
+                { cwd: this.repoDir }
             );
             this.logger.debug('[git] Diff check done');
             return result.stdout.split('\n').filter(Boolean);
@@ -200,13 +198,13 @@ export class GitService implements GitServiceInterface {
         return this.worker.schedule(async () => {
             this.logger.debug('[git] Changes check running');
             if (!this.branchFetched) {
-                await this.run.command('git', ['fetch', 'origin', `${this.repoPublishBranch}:${this.repoPublishBranch}`], this.repoDir);
+                await this.runCommand('git', ['fetch', 'origin', `${this.repoPublishBranch}:${this.repoPublishBranch}`], { cwd: this.repoDir });
                 this.branchFetched = true;
             }
-            const logResult = await this.run.command(
+            const logResult = await this.runCommand(
                 'git',
                 ['log', '--pretty=format:commit:%H%n%at%n%ae%x28%an%x29', '--name-status', `${this.repoPublishBranch}..${this.repoBranch}`],
-                this.repoDir
+                { cwd: this.repoDir }
             );
             this.logger.debug('[git] Changes check done');
             return logResult.stdout
@@ -223,7 +221,10 @@ export class GitService implements GitServiceInterface {
                             .map((line) => line.trim().split(/\t/))
                             .filter(Boolean)
                             .filter(([status, filename]) => status && filename)
-                            .map(([status, filename]) => [GIT_LOG_CHANGE_TYPES[status!] || 'modified', filename])
+                            .map(([status, filename]) => ({
+                                status: GIT_LOG_CHANGE_TYPES[status!] || 'modified',
+                                filePath: filename
+                            }))
                     };
                 })
                 .reverse();

package/src/services/run.ts

@@ -1,22 +1,17 @@
 import childProcess, { ChildProcessWithoutNullStreams } from 'child_process';
-import { RunServiceInterface } from '@stackbit/types';
+import { CommandRunner, RunResult } from '@stackbit/types';
 
-export class RunService implements RunServiceInterface {
-    private readonly env: NodeJS.ProcessEnv;
-    private readonly uid?: number;
-
-    constructor(options: { env: NodeJS.ProcessEnv; uid?: number }) {
-        this.env = options.env;
-        this.uid = options.uid;
-    }
-
-    command(command: string, args: string[], cwd?: string, shell?: boolean) {
+export function getCommandRunner(commandRunnerOptions: { env: NodeJS.ProcessEnv; uid?: number }): CommandRunner {
+    return (command: string, args?: string[], options?: { cwd?: string; shell?: boolean; env?: NodeJS.ProcessEnv }): Promise<RunResult> => {
         return getProcessPromise(
             childProcess.spawn(command, args, {
-                cwd: cwd,
-                shell: shell,
-                env: this.env,
-                ...(this.uid ? { uid: this.uid } : {})
+                cwd: options?.cwd,
+                shell: options?.shell,
+                env: {
+                    ...commandRunnerOptions.env,
+                    ...options?.env
+                },
+                ...(commandRunnerOptions.uid ? { uid: commandRunnerOptions.uid } : {})
             })
         );
     }