Merge branch 'master' of https://github.com/dbgate/diflow

Author: SPRINX0\prochazka

.github/workflows/build-npm.yaml

@@ -0,0 +1,35 @@
+name: NPM package
+'on':
+  push:
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-22.04
+    steps:
+      - name: Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Use Node.js 22.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 22.x
+      - name: Configure NPM token
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+      - name: npm install
+        run: |
+          npm install
+      - name: Publish
+        run: |
+          npm publish

package.json

@@ -1,6 +1,9 @@
 {
-  "name": "gitdiff",
-  "version": "1.0.0",
+  "name": "diflow",
+  "version": "1.0.1",
+  "bin": {
+    "diflow": "./dist/diflow.js"
+  },
   "scripts": {
     "build": "tsc",
     "test": "npm run build && jest --runInBand",
@@ -10,18 +13,23 @@
     "test:dbgate": "yarn tsc && node dist/diflow sync -r https://github.com/dbgate/dbgate-diflow-config.git -b master --skip-push --clear",
     "test:dbgate:push": "yarn tsc && node dist/diflow sync -r https://github.com/dbgate/dbgate-diflow-config.git -b master --clear"
   },
+  "files": [
+    "LICENSE",
+    "README.md",
+    "dist"
+  ],
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.19",
-    "fs-extra": "^11.2.0",
     "jest": "^29.7.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },
   "dependencies": {
     "@types/lodash": "^4.17.15",
     "commander": "^13.1.0",
+    "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
     "minimatch": "^10.0.1",
     "rimraf": "^6.0.1"

src/diflow.ts

@@ -1,6 +1,7 @@
 import path from 'path';
 import { Processor } from './processor';
 import { Command } from 'commander';
+import { filesystemMerge } from './fsmerge';
 
 const program = new Command();
 
@@ -20,7 +21,7 @@ program
     'secret for accessing repo. URLs of git repos should be in shape https://DIFLOW_GIT_SECRET@<url>. You could also use DIFLOW_GIT_SECRET env variable.'
   )
   .option('--clear', 'clear work repos before running')
-  .action(options => {
+  .action(async options => {
     // console.log('repo:', options.repo);
     // console.log('branch:', options.branch);
     // return;
@@ -29,7 +30,18 @@ program
       clear: options.clear,
       secret: options.secret ?? process.env.DIFLOW_GIT_SECRET,
     });
-    processor.process();
+    await processor.process();
+    console.log('Processing complete.');
+  });
+
+program
+  .command('fsmerge')
+  .description('Run simple merge between directories (base+diff=merged)')
+  .requiredOption('-b, --base <string>', 'Foder with base repository')
+  .requiredOption('-d, --diff <string>', 'Foder with diff repository')
+  .requiredOption('-m, --merged <string>', 'Foder with merged repository (output folder)')
+  .action(async options => {
+    await filesystemMerge(options.base, options.diff, options.merged);
     console.log('Processing complete.');
   });
 

src/fsmerge.ts

@@ -0,0 +1,51 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+function skipPath(src: string) {
+  if (src.includes('/node_modules/')) return true;
+  if (src.includes('\\node_modules\\')) return true;
+
+  if (src.includes('/.git/')) return true;
+  if (src.includes('\\.git\\')) return true;
+
+  return false;
+}
+
+async function copyDir(src: string, dest: string) {
+  // Check if the source directory exists
+  if (!await fs.exists(src)) {
+    console.error(`Source directory "${src}" does not exist.`);
+    return;
+  }
+
+  // Create the destination directory if it does not exist
+  if (!await fs.exists(dest)) {
+    await fs.mkdir(dest, { recursive: true });
+  }
+
+  // Read the contents of the source directory
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  for (let entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (skipPath(srcPath)) continue;
+    if (skipPath(destPath)) continue;
+
+    if (entry.isDirectory()) {
+      await copyDir(srcPath, destPath);
+    } else {
+      await fs.copy(destPath, srcPath);
+    }
+  }
+}
+
+export async function filesystemMerge(base: string, diff: string, merged: string) {
+  await fs.ensureDir(merged);
+  console.log('Copying:', base, '=>', merged);
+  await copyDir(base, merged);
+  console.log('Copying:', diff, '=>', merged);
+  await copyDir(diff, merged);
+  console.log('Directories merged successfully');
+}

src/processor.ts

@@ -283,7 +283,7 @@ class CommitProcessor {
       let target = this.processor.config?.newFilesTargetDefault ?? 'diff';
       if (
         await this.matchIdentifiers(
-          this.processor.repoPaths.diff,
+          this.processor.repoPaths.merged,
           file.file,
           this.processor.config?.repos.base.identifiers
         )
@@ -292,7 +292,7 @@ class CommitProcessor {
       }
       if (
         await this.matchIdentifiers(
-          this.processor.repoPaths.diff,
+          this.processor.repoPaths.merged,
           file.file,
           this.processor.config?.repos.diff.identifiers
         )