feature/story_006b: Atomic Aggregation | Bug 2 | saveRepo method appends -- automated

Author: lotsofthoughts

.semver.commit.tag

@@ -1,3 +1,3 @@
-Last Commit: commit c156825300878f21ab73dadb2623e359ccf54607
+Last Commit: commit 4d637115a3e8d234b8937ab78d94092cbed4c111
 Author: Lyns <104910306+lotsofthoughts@users.noreply.github.com>
-Date:   Wed Jul 16 12:34:06 2025 -0400
+Date:   Mon Jul 21 11:24:30 2025 -0400

.semver.version.tag

@@ -1 +1 @@
-0.3.5
+0.3.6

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@softdist/extensions",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "license": "MIT",
   "exports": "./src/mod.ts",
   "test": {

release-notes.md

@@ -10,6 +10,11 @@ _An abstract extension system for inspection of Github scopes and settings_
 - Package: [@softdist/extensions](https://jsr.io/@softdist/extensions)
 - Repository: [@pkgdist/extensions](https://github.com/pkgdist/extensions)
 
+## ^0.3.6
+- Implement a new saveRepo object in `class_reporting.ts` because repos keep getting clobbered due to using `createReport` before each dynamic test in `deno run`
+- New object saves data by appending to existing files.
+- Updated the `check_branch.ts` file and multi-test case in `tests.class_reporting.ts`
+  
 ## ^0.3.5
 
 - Implemented a bug where the repo aggregator was not seeing other extensiobs of

src/check_branch.ts

@@ -37,9 +37,9 @@ console.log(
 )
 
 // mock the reporting for fun
-const report = await $reporting.createReport([], 'report_aggregate.json')
+const report1 = await $reporting.createReport([], 'report_aggregate.json')
 type ReportRecord = Record<string, unknown>
-await report.addEntry(
+await report1.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -55,8 +55,8 @@ await report.addEntry(
     },
   }),
 )
-
-await report.addEntry(
+const report2 = await $reporting.createReport([], 'report_aggregate.json')
+await report2.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -72,8 +72,8 @@ await report.addEntry(
     },
   }),
 )
-
-await report.addEntry(
+const report3 = await $reporting.createReport([], 'report_aggregate.json')
+await report3.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -90,7 +90,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report4 = await $reporting.createReport([], 'report_aggregate.json')
+await report4.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -107,7 +108,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report5 = await $reporting.createReport([], 'report_aggregate.json')
+await report5.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 0,
@@ -124,7 +126,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report6 = await $reporting.createReport([], 'report_aggregate.json')
+await report6.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -141,7 +144,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report7 = await $reporting.createReport([], 'report_aggregate.json')
+await report7.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -158,7 +162,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report8 = await $reporting.createReport([], 'report_aggregate.json')
+await report8.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,
@@ -175,7 +180,8 @@ await report.addEntry(
   }),
 )
 
-await report.addEntry(
+const report9 = await $reporting.createReport([], 'report_aggregate.json')
+await report9.addEntry(
   'aggregate_report',
   $reporting.createReportEntry<Type.ReportEntryWithNone<ReportRecord>>({
     score: 2,

src/class_reporting.ts

@@ -122,17 +122,27 @@ export class Reporting<T> {
   // Save each repo's data to a temporary JSON file
   private async saveRepo(repo: string) {
     const tempFile = `${repo}.tmp.json`
-    const repoData = this.aggregate.repos[repo]
-    if (!repoData) {
-      console.error(`No data found for repo: ${repo}. Skipping save.`)
-      return
+    let existingData: Type.GenericReportEntry<T>[] = []
+
+    // Load existing data from the temporary file if it exists
+    try {
+      const data = await Deno.readTextFile(tempFile)
+      existingData = JSON.parse(data)
+    } catch (error) {
+      if (error instanceof Deno.errors.NotFound) {
+        console.log(`No existing data found for repo: ${repo}. Starting fresh.`)
+      } else {
+        console.error(`Failed to load temporary file for repo: ${repo}. Error:`, error)
+        throw error
+      }
     }
 
-    this.writeLock = this.writeLock.then(async () => {
-      await Deno.writeTextFile(tempFile, JSON.stringify(repoData, null, 2))
-      console.log(`Saved temporary file for repo: ${repo}`)
-    })
-    await this.writeLock
+    // Append new data to the existing data
+    const updatedData = [...existingData, ...this.aggregate.repos[repo]]
+
+    // Write the updated data back to the temporary file
+    await Deno.writeTextFile(tempFile, JSON.stringify(updatedData, null, 2))
+    console.log(`Saved updated data for repo: ${repo} to ${tempFile}`)
   }
 
   // Combine all temporary files into the final aggregate report
@@ -185,6 +195,7 @@ export class Reporting<T> {
   async load() {
     try {
       const data = await Deno.readTextFile(this.outputFile)
+      console.log(`Loading report file: ${this.outputFile}`)
       this.aggregate = JSON.parse(data)
     } catch (error) {
       if (error instanceof Deno.errors.NotFound) {

src/tests/tests.class_reporting.ts

@@ -29,21 +29,22 @@ Deno.test('Reporting: creates and saves aggregate report with correct structure'
   const testFile = 'test_report_aggregate.json'
   await cleanup(testFile)
 
-  const report = await $reporting.createReport([], testFile)
-
-  // Register mock hook
-  report.registerHook(mockNotifyTeams)
+  const report1 = await $reporting.createReport([], testFile)
+  report1.registerHook(mockNotifyTeams)
 
   // Add entries for two repos
-  await report.addEntry('name', {
+  await report1.addEntry('name', {
     score: 1,
     rule: 'require-connect-yml',
     description: 'desc1',
     repo: 'repo1',
     path: '/repo1',
     success: true,
   })
-  await report.addEntry('name', {
+
+  const report2 = await $reporting.createReport([], testFile)
+  report2.registerHook(mockNotifyTeams)
+  await report2.addEntry('name', {
     score: 0,
     rule: 'require-connect-yml',
     description: 'desc2',

src/version.ts

@@ -1,2 +1,3 @@
+
 // This file is auto-generated. Do not edit.
-export const generatedVersion = '0.3.5'
+export const generatedVersion = "0.3.6";