@galacean/cli 0.0.2 → 0.0.4

package/README.md

@@ -8,33 +8,4 @@ $ npm i -g @galacean/cli
 galacean diff <project1-url> <project2-url>
 ```
 
-执行命令后会在命令文件夹下生成『项目 diff.md』文件，可以打开查看 diff 数据。
-
-
-
-## 测试 case
-
-project: https://local.alipay.net:4000/#/project/24400002
-
-- 资产
-
-  - [ ] 资产新增
-  - https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*3htQQZ8Fa0sAAAAAAAAAAAAADnN-AQ/project.json https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*smcAQqM3oy0AAAAAAAAAAAAADnN-AQ/project.json
-  - [ ] 资产移除
-  - https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*smcAQqM3oy0AAAAAAAAAAAAADnN-AQ/project.json https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*3htQQZ8Fa0sAAAAAAAAAAAAADnN-AQ/project.json
-
-- 场景
-
-  - Entity
-    - [x] Entity 新增
-      - https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*vuobSqCRjRcAAAAAAAAAAAAADnN-AQ/project.json https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*px25TbJo7CYAAAAAAAAAAAAADnN-AQ/project.json
-    - [x] Entity 移除
-      - https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*px25TbJo7CYAAAAAAAAAAAAADnN-AQ/project.json https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*vuobSqCRjRcAAAAAAAAAAAAADnN-AQ/project.json
-  - 组件
-    - [ ] 组件新增
-      - https://mdn.alipayobjects.com/oasis_be/afts/file/A*R9kHQZQhOtUAAAAAAAAAAAAADkp5AQ/project.json https://mdn.alipayobjects.com/oasis_be/afts/file/A*yB3uQKIU6HUAAAAAAAAAAAAADkp5AQ/project.json
-    - [ ] 组件移除
-      - https://mdn.alipayobjects.com/oasis_be/afts/file/A*yB3uQKIU6HUAAAAAAAAAAAAADkp5AQ/project.json https://mdn.alipayobjects.com/oasis_be/afts/file/A*R9kHQZQhOtUAAAAAAAAAAAAADkp5AQ/project.json
-
-- 复合 case
-  - https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*Y9y2R784BXUAAAAAAAAAAAAADnN-AQ/project.json https://mmtcdp.stable.alipay.net/oasis_be/afts/file/A*OsYURKUVT9YAAAAAAAAAAAAADnN-AQ/project.json
+执行命令后会在命令文件夹下生成『项目 diff.md』文件，可以打开查看 diff 数据。

package/lib/cli.js

@@ -2,7 +2,7 @@ import { cac } from "cac";
 import path from "path";
 import fs from "fs-extra";
 import * as url from "url";
-import { diffProjects } from "./diff.js";
+import { _diffProjects, diffProjects } from "./diff.js";
 import { getFileBufferFromUrl } from "./utils.js";
 import { markdown } from "./Markdown.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -22,6 +22,15 @@ cli.command("diff [...files]", "diff files").action((files) => {
         markdown.generate();
     });
 });
+export function diffProject(before, after) {
+    return Promise.all([
+        getFileBufferFromUrl(before),
+        getFileBufferFromUrl(after),
+    ]).then((res) => {
+        const result = res.map((item) => JSON.parse(item.toString()));
+        return _diffProjects(result[0], result[1]);
+    });
+}
 const pkg = fs.readJSONSync(path.join(__dirname, "../package.json"));
 cli.help();
 cli.version(pkg.version);

package/lib/diff.js

@@ -2,6 +2,39 @@ import { Operation, diff, flattenChangeset } from "json-diff-ts";
 import { groupBy, cloneDeep } from "lodash-es";
 import { getFileBufferFromUrl } from "./utils.js";
 import { markdown } from "./Markdown.js";
+export async function _diffProjects(project1, project2) {
+    const result = diff(project1, project2, { files: "id" });
+    const changes = flattenChangeset(result);
+    const assets1 = {};
+    const assets2 = {};
+    project1.files.forEach((item) => {
+        assets1[item.id] = item;
+    });
+    project2.files.forEach((item) => {
+        assets2[item.id] = item;
+    });
+    const diffs = groupBy(changes, "type");
+    const sceneChanges = [];
+    const assetsChangeInfo = { add: [], remove: [] };
+    const scenesChangeInfo = {};
+    diffs[Operation.ADD]?.forEach((item) => {
+        assetsChangeInfo.add.push(item.value.virtualPath);
+    });
+    diffs[Operation.REMOVE]?.forEach((item) => {
+        assetsChangeInfo.remove.push(item.value.virtualPath);
+    });
+    diffs[Operation.UPDATE]?.forEach((item) => {
+        const id = getIdFromPath(item.path);
+        const asset = assets1[id];
+        if (asset.type === "Scene") {
+            sceneChanges.push(asset);
+        }
+    });
+    await Promise.all(sceneChanges.map(async (asset) => {
+        scenesChangeInfo[assets2[asset.id].virtualPath] = await _diffScene(asset.path, assets2[asset.id].path);
+    }));
+    return { assetsChangeInfo, scenesChangeInfo };
+}
 export async function diffProjects(project1, project2) {
     const result = diff(project1, project2, { files: "id" });
     const changes = flattenChangeset(result);
@@ -54,12 +87,6 @@ async function diffScene(url1, url2) {
     const { diffObj: diffObj1, entities } = getEntities(scene1);
     const { diffObj: diffObj2, entities: newEntities } = getEntities(scene2);
     const changes = flattenChangeset(diff(diffObj1, diffObj2));
-    // const changesGroup = groupBy(changes, "type");
-    // markdown.addLine(``);
-    // markdown.addLine(`- Entity 移除`);
-    // changesGroup[Operation.REMOVE]?.forEach((item) => {
-    //   markdown.addLine(`- ${entities[item.key].name}`, 1);
-    // });
     const groups = groupBy(changes, (item) => {
         if (item.path.includes(".components")) {
             return "components";
@@ -102,6 +129,56 @@ async function diffScene(url1, url2) {
         });
     }
 }
+async function _diffScene(url1, url2) {
+    const [scene1, scene2] = await Promise.all([
+        getFileBufferFromUrl(url1),
+        getFileBufferFromUrl(url2),
+    ]).then((res) => res.map((item) => JSON.parse(item.toString())));
+    const { diffObj: diffObj1, entities } = getEntities(scene1);
+    const { diffObj: diffObj2, entities: newEntities } = getEntities(scene2);
+    const changes = flattenChangeset(diff(diffObj1, diffObj2));
+    const sceneChangeInfo = {
+        entities: { add: [], remove: [] },
+        components: { add: [], remove: [] },
+        error: null,
+    };
+    if (Object.values(newEntities).length <= 0) {
+        sceneChangeInfo.error = "Entities is empty";
+    }
+    const groups = groupBy(changes, (item) => {
+        if (item.path.includes(".components")) {
+            return "components";
+        }
+        return "entities";
+    });
+    if (groups["entities"]) {
+        const changesGroup = groupBy(groups["entities"], "type");
+        changesGroup[Operation.ADD]?.forEach((item) => {
+            const entityPath = getEntityPath(item.key, newEntities);
+            sceneChangeInfo.entities.add.push(entityPath);
+        });
+        changesGroup[Operation.REMOVE]?.forEach((item) => {
+            const entityPath = getEntityPath(item.key, entities);
+            sceneChangeInfo.entities.remove.push(entityPath);
+        });
+    }
+    if (groups["components"]) {
+        const changesGroup = groupBy(groups["components"], "type");
+        changesGroup[Operation.ADD]?.forEach((item) => {
+            const entityId = getComponentEntityId(item.path);
+            const entityPath = getEntityPath(entityId, entities);
+            const comp = item.value;
+            sceneChangeInfo.components.add.push(`- ${entityPath} [${comp["class"]}]`);
+        });
+        changesGroup[Operation.REMOVE]?.forEach((item) => {
+            const entityId = getComponentEntityId(item.path);
+            const entityPath = getEntityPath(entityId, entities);
+            const comp = item.value;
+            sceneChangeInfo.components.remove.push(`- ${entityPath} [${comp["class"]}]`);
+        });
+    }
+    return sceneChangeInfo;
+}
 function getComponentEntityId(str) {
     let regex = /\.([^.]*?)\.components/;
     let matches = str.match(regex);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@galacean/cli",
-  "version": "0.0.2",
-  "main": "index.js",
+  "version": "0.0.4",
+  "main": "lib/index.js",
   "type": "module",
   "author": {
     "name": "gz65555",

package/types/cli.d.ts

@@ -1 +1,7 @@
-export {};
+export declare function diffProject(before: string, after: string): Promise<{
+    assetsChangeInfo: {
+        add: any[];
+        remove: any[];
+    };
+    scenesChangeInfo: {};
+}>;

package/types/diff.d.ts

@@ -1 +1,8 @@
+export declare function _diffProjects(project1: any, project2: any): Promise<{
+    assetsChangeInfo: {
+        add: any[];
+        remove: any[];
+    };
+    scenesChangeInfo: {};
+}>;
 export declare function diffProjects(project1: any, project2: any): Promise<void>;