new file identifiers

Author: SPRINX0\prochazka

src/diflow.test.ts

@@ -193,8 +193,8 @@ describe('Git Repository Tests', () => {
   });
 
   test('Adding file to merged', async () => {
-    await createTestCommit(getTestRepoPath('merged'), 'outer.txt', 'outer', 'merged');
-    await createTestCommit(getTestRepoPath('merged'), 'folder/inner.txt', 'inner', 'merged');
+    await createTestCommit(getTestRepoPath('merged'), 'normal-folder/diff.txt', 'diff content', 'merged');
+    await createTestCommit(getTestRepoPath('merged'), 'base-folder/base.txt', 'base content', 'merged');
 
     await beforeDiflow();
 
@@ -205,10 +205,10 @@ describe('Git Repository Tests', () => {
 
     await checkStateInConfig();
 
-    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'outer.txt'))).toBe(true);
-    expect(await fs.exists(path.join(getTestRepoPath('base'), 'outer.txt'))).toBe(false);
+    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'normal-folder/diff.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'normal-folder/diff.txt'))).toBe(false);
 
-    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'folder/inner.txt'))).toBe(false);
-    expect(await fs.exists(path.join(getTestRepoPath('base'), 'folder/inner.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('diff'), 'base-folder/base.txt'))).toBe(false);
+    expect(await fs.exists(path.join(getTestRepoPath('base'), 'base-folder/base.txt'))).toBe(true);
   });
 });

src/processor.ts

@@ -12,7 +12,7 @@ import {
   repoHasModifications,
   runGitCommand,
 } from './tools';
-import { ChangeItem, Config, RepoId, State } from './types';
+import { ChangeItem, Config, RepoId, RepoIdentifier, State } from './types';
 import { minimatch } from 'minimatch';
 import { rimraf } from 'rimraf';
 
@@ -245,13 +245,56 @@ class CommitProcessor {
     }
   }
 
+  async matchIdentifiers(repoPath: string, file: string, identifiers?: RepoIdentifier[]) {
+    if (!identifiers) {
+      return false;
+    }
+
+    let content: string | null = null;
+    for (const identifier of identifiers) {
+      if (identifier.content) {
+        if (content == null) {
+          content = await fs.readFile(path.join(repoPath, file), 'utf8');
+        }
+        if (content.includes(identifier.content)) {
+          return true;
+        }
+      }
+      if (identifier.name) {
+        if (minimatch(file, identifier.name, { partial: true })) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   async processMergedFile(file: ChangeItem) {
     if (file.action === 'A') {
-      if (await fs.exists(path.join(this.processor.repoPaths.diff, path.dirname(file.file)))) {
-        // if exists folder, copy to diff
-        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file);
-      } else {
+      let target = this.processor.config?.newFilesTargetDefault ?? 'diff';
+      if (
+        await this.matchIdentifiers(
+          this.processor.repoPaths.diff,
+          file.file,
+          this.processor.config?.repos.base.identifiers
+        )
+      ) {
+        target = 'base';
+      }
+      if (
+        await this.matchIdentifiers(
+          this.processor.repoPaths.diff,
+          file.file,
+          this.processor.config?.repos.diff.identifiers
+        )
+      ) {
+        target = 'diff';
+      }
+
+      if (target === 'base') {
         await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.base, file.file);
+      } else {
+        await copyRepoFile(this.processor.repoPaths.merged, this.processor.repoPaths.diff, file.file);
       }
     } else if (file.action === 'M') {
       if (await repoFileExists(this.processor.repoPaths.diff, file.file)) {

src/testrepo.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { rimraf } from 'rimraf';
 import { execAsync, getCommits, getHeadCommitInRepo, sleep } from './tools';
-import { State } from './types';
+import { Config, State } from './types';
 import _ from 'lodash';
 
 export function getTestRepoPath(repo: string) {
@@ -62,20 +62,28 @@ export async function initTestRepos() {
   const diffHash = await createTestCommit(getTestRepoPath('diff'), 'file1.txt', 'different content', 'diff');
   const mergedHash = await createTestCommit(getTestRepoPath('merged'), 'file1.txt', 'different content', 'merged');
 
-  // Create config.json in config repo
-  const configContent = JSON.stringify(
-    {
-      branches: ['master'],
-      repos: {
-        base: { url: getTestRepoPath('base') },
-        diff: { url: getTestRepoPath('diff') },
-        merged: { url: getTestRepoPath('merged') },
+  const config: Config = {
+    repos: {
+      base: {
+        url: getTestRepoPath('base'),
+        identifiers: [
+          {
+            name: 'base-folder/**',
+          },
+        ],
+      },
+      diff: {
+        url: getTestRepoPath('diff'),
+      },
+      merged: {
+        url: getTestRepoPath('merged'),
       },
-      ignorePaths: ['.github/**'],
     },
-    null,
-    2
-  );
+    ignorePaths: ['.github/**'],
+  };
+
+  // Create config.json in config repo
+  const configContent = JSON.stringify(config, null, 2);
   await createTestCommit(getTestRepoPath('config'), 'config.json', configContent, 'config');
 
   // Create state.json in config repo

src/types.ts

@@ -5,14 +5,25 @@ export interface RepoConfig {
   url: string;
 }
 
+export interface RepoIdentifier {
+  content?: string;
+  name?: string;
+  // applyOnExisting?: boolean;
+}
+
+export interface SourceRepoConfig extends RepoConfig {
+  identifiers?: RepoIdentifier[];
+}
+
 export interface Config {
   repos: {
-    base: RepoConfig;
-    diff: RepoConfig;
+    base: SourceRepoConfig;
+    diff: SourceRepoConfig;
     merged: RepoConfig;
   };
   ignorePaths: string[];
   syncCommitPrefix?: string;
+  newFilesTargetDefault?: 'base' | 'diff'; // default: diff
 }
 
 export interface State {