@verdant-web/server 3.0.0 → 3.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/esm/storage/sql/SqlOperations.js +10 -5
  2. package/dist/esm/storage/sql/SqlOperations.js.map +1 -1
  3. package/package.json +2 -2
  4. package/src/storage/sql/SqlOperations.ts +10 -9
package/dist/esm/storage/sql/SqlOperations.js CHANGED
@@ -93,11 +93,16 @@ export class SqlOperations {
93
93
  .execute();
94
94
  };
95
95
  this.delete = async (libraryId, operations) => {
96
- await this.db
97
- .deleteFrom('OperationHistory')
98
- .where('libraryId', '=', libraryId)
99
- .where('oid', 'in', operations.map((o) => o.oid))
100
- .execute();
96
+ await this.db.transaction().execute(async (tx) => {
97
+ for (const item of operations) {
98
+ await tx
99
+ .deleteFrom('OperationHistory')
100
+ .where('libraryId', '=', libraryId)
101
+ .where('oid', '=', item.oid)
102
+ .where('timestamp', '=', item.timestamp)
103
+ .execute();
104
+ }
105
+ });
101
106
  };
102
107
  }
103
108
  }
package/dist/esm/storage/sql/SqlOperations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@verdant-web/server",
3
- "version": "3.0.0",
3
+ "version": "3.0.2",
4
4
  "access": "public",
5
5
  "type": "module",
6
6
  "bin": {
@@ -33,7 +33,7 @@
33
33
  "kysely-plugin-serialize": "^0.5.7",
34
34
  "minimist": "^1.2.8",
35
35
  "ws": "^8.9.0",
36
- "@verdant-web/common": "2.3.0"
36
+ "@verdant-web/common": "2.3.1"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@types/async-lock": "^1.3.0",
package/src/storage/sql/SqlOperations.ts CHANGED
@@ -136,14 +136,15 @@ export class SqlOperations implements OperationStorage {
136
136
  libraryId: string,
137
137
  operations: Operation[],
138
138
  ): Promise<void> => {
139
- await this.db
140
- .deleteFrom('OperationHistory')
141
- .where('libraryId', '=', libraryId)
142
- .where(
143
- 'oid',
144
- 'in',
145
- operations.map((o) => o.oid),
146
- )
147
- .execute();
139
+ await this.db.transaction().execute(async (tx) => {
140
+ for (const item of operations) {
141
+ await tx
142
+ .deleteFrom('OperationHistory')
143
+ .where('libraryId', '=', libraryId)
144
+ .where('oid', '=', item.oid)
145
+ .where('timestamp', '=', item.timestamp)
146
+ .execute();
147
+ }
148
+ });
148
149
  };
149
150
  }