@galacean/cli 0.0.5 → 0.0.6

package/lib/cli.js

@@ -14,6 +14,8 @@ import * as url from "url";
 import { _diffProjects, diffProjects } from "./diff.js";
 import { getFileBufferFromUrl } from "./utils.js";
 import { markdown } from "./Markdown.js";
+import { mergeProject } from "./mergeProject.js";
+import * as ncp from "copy-paste";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const cli = cac();
 cli.command("diff [...files]", "diff files").action((files) => {
@@ -31,6 +33,26 @@ cli.command("diff [...files]", "diff files").action((files) => {
         markdown.generate();
     }));
 });
+cli
+    .command("merge [...files]", "merge project.json by md5")
+    .action((files) => __awaiter(void 0, void 0, void 0, function* () {
+    const before = files[0];
+    const after = files[1];
+    yield Promise.all([
+        getFileBufferFromUrl(before),
+        getFileBufferFromUrl(after),
+    ]).then((res) => {
+        const result = res.map((item) => JSON.parse(item.toString()));
+        const resProject = mergeProject(result[0], result[1]);
+        const output = JSON.stringify(resProject, null, 2);
+        // console.log(output);
+        return new Promise((resolve) => {
+            ncp.copy(output, () => {
+                resolve();
+            });
+        });
+    });
+}));
 export function diffProject(before, after) {
     return Promise.all([
         getFileBufferFromUrl(before),

package/lib/mergeProject.js

@@ -0,0 +1,21 @@
+export function mergeProject(before, after) {
+    const originFiles = {};
+    before.files.forEach((file) => {
+        originFiles[file.id] = file;
+    });
+    const afterFiles = {};
+    after.files.forEach((file) => {
+        afterFiles[file.id] = file;
+    });
+    const resultFiles = Object.assign({}, afterFiles);
+    Object.keys(afterFiles).forEach((id) => {
+        const originItem = originFiles[id];
+        const afterItem = afterFiles[id];
+        if (originItem && originItem.md5 && originItem.md5 === afterItem.md5) {
+            // 资产修改
+            afterItem.path = originItem.path;
+        }
+    });
+    after.files = Object.values(resultFiles).filter((item) => item != undefined);
+    return after;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/cli",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "main": "lib/index.js",
   "type": "module",
   "author": {
@@ -33,6 +33,7 @@
     "@types/lodash-es": "^4.17.12",
     "cac": "^6.7.3",
     "chalk": "^5.3.0",
+    "copy-paste": "^1.5.3",
     "fs-extra": "^10.0.0",
     "inquirer": "^8.1.2",
     "json-diff-ts": "^2.2.1",

package/types/mergeProject.d.ts

@@ -0,0 +1,10 @@
+interface IProject {
+    files: Array<IFile>;
+}
+interface IFile {
+    path: string;
+    md5: string;
+    id: string;
+}
+export declare function mergeProject(before: IProject, after: IProject): IProject;
+export {};