feat: add canyon-data

package.json

@@ -10,16 +10,13 @@
     "test": "pnpm -r do-test",
     "dev": "pnpm -r do-dev",
     "build": "pnpm -r do-build",
-    "migrate": "npx prisma migrate dev --schema ./packages/canyon-backend/prisma/schema.prisma",
     "rm": "find ./ -type d \\( -name \"dist\" -o -name \"node_modules\" \\) -exec rm -rf {} +",
     "preinstall": "node ./scripts/check.js",
     "prepare": "husky"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
-    "husky": "^9.0.11",
-    "prisma": "^5.16.0",
-    "@biomejs/biome": "1.8.2"
+    "husky": "^9.0.11"
   }
 }

packages/canyon-backend/package.json

@@ -29,6 +29,7 @@
     "better-sqlite3": "^9.6.0",
     "body-parser": "^1.20.2",
     "camaro": "^6.2.3",
+    "canyon-data": "0.1.1-alpha.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cookie-parser": "^1.4.6",

packages/canyon-backend/src/coverage/services/core/consumer-coverage.service.ts

@@ -3,7 +3,6 @@ import { PrismaService } from '../../../prisma/prisma.service';
 import {
   genSummaryMapByCoverageMap,
   getSummaryByPath,
-  mergeCoverageMap,
 } from '@canyon/data';
 import { percent, removeNullKeys } from '../../../utils/utils';
 import { CoverageDataAdapterService } from '../common/coverage-data-adapter.service';
@@ -14,7 +13,7 @@ import { TestExcludeService } from '../common/test-exclude.service';
 import { formatReportObject } from '../../../utils/coverage';
 import { resolveProjectID } from '../../../utils';
 import { PullFilePathAndInsertDbService } from '../common/pull-file-path-and-insert-db.service';
-
+import {merge_coverage_json_str} from 'canyon-data'
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 @Injectable()
@@ -117,7 +116,7 @@ export class ConsumerCoverageService {
         coverage.relationID,
       );
 
-      const newcoverage = mergeCoverageMap(queueDataToBeConsumed.coverage, cov);
+      const newcoverage = JSON.parse(merge_coverage_json_str(JSON.stringify(queueDataToBeConsumed.coverage), JSON.stringify(cov)));
 
       await this.prisma.coverage.update({
         where: {

packages/canyon-backend/src/coverage/services/core/coveragedisk.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { CoveragediskEntity } from '../../entity/coveragedisk.entity';
 import { Repository } from 'typeorm';
-import { mergeCoverageMap } from '@canyon/data';
+import {merge_coverage_json_str} from 'canyon-data'
 
 @Injectable()
 export class CoveragediskService {
@@ -56,7 +56,7 @@ export class CoveragediskService {
         where: { id: coveragedisks[i].id, pid: String(process.pid) },
       });
       //   聚合
-      cov = mergeCoverageMap(cov, JSON.parse(toBeConsumedQueues.data).coverage);
+      cov = JSON.parse(merge_coverage_json_str(JSON.stringify(cov), JSON.stringify(JSON.parse(toBeConsumedQueues.data).coverage)));
       await this.coveragediskRepository.delete({ id: coveragedisks[i].id });
     }
     return {