@nu-art/conflict-resolution-shared 0.401.8 → 0.500.0
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.
- package/index.js +5 -0
- package/package.json +7 -8
- package/types.d.ts +14 -2
- package/types.js +6 -1
package/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nu-art/conflict-resolution-shared",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.500.0",
|
|
4
4
|
"description": "Conflict Resolution Shared",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"TacB0sS",
|
|
@@ -16,13 +16,12 @@
|
|
|
16
16
|
},
|
|
17
17
|
"repository": {
|
|
18
18
|
"type": "git",
|
|
19
|
-
"url": "git+ssh://git@github.com:nu-art-js/thunderstorm.git"
|
|
19
|
+
"url": "git+ssh://git@github.com:nu-art-js/thunderstorm.git",
|
|
20
|
+
"directory": "_thunderstorm/to-review/conflict-resolution/shared"
|
|
20
21
|
},
|
|
21
22
|
"license": "Apache-2.0",
|
|
22
23
|
"author": "TacB0sS",
|
|
23
|
-
"scripts": {
|
|
24
|
-
"build": "tsc"
|
|
25
|
-
},
|
|
24
|
+
"scripts": {},
|
|
26
25
|
"contributors": [
|
|
27
26
|
{
|
|
28
27
|
"name": "TacB0sS"
|
|
@@ -37,9 +36,9 @@
|
|
|
37
36
|
"linkDirectory": true
|
|
38
37
|
},
|
|
39
38
|
"dependencies": {
|
|
40
|
-
"@nu-art/
|
|
41
|
-
"@nu-art/ts-
|
|
42
|
-
"@nu-art/
|
|
39
|
+
"@nu-art/db-api-shared": "0.500.0",
|
|
40
|
+
"@nu-art/ts-common": "0.500.0",
|
|
41
|
+
"@nu-art/ts-styles": "0.500.0",
|
|
43
42
|
"react": "^18.0.0"
|
|
44
43
|
},
|
|
45
44
|
"devDependencies": {
|
package/types.d.ts
CHANGED
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import type { UniqueId } from '@nu-art/ts-common';
|
|
3
|
+
import { DB_Prototype } from '@nu-art/db-api-shared';
|
|
4
|
+
/** Same shape as @nu-art/db-api-backend DBEntityDependencies; used by frontend without depending on backend. */
|
|
5
|
+
export type DBEntityDependencyResult = {
|
|
6
|
+
[dbKey: string]: UniqueId[];
|
|
7
|
+
};
|
|
8
|
+
export type DBEntityDependencies = {
|
|
9
|
+
dbKey: string;
|
|
10
|
+
dependencyMap: {
|
|
11
|
+
[entityId: UniqueId]: DBEntityDependencyResult;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
export declare const DBEntityDependencyErrorType = "entity-has-dependencies";
|
|
15
|
+
export type ConflictResolutionItem<Proto extends DB_Prototype> = {
|
|
4
16
|
dbKey: Proto['dbKey'];
|
|
5
17
|
renderer: (instance: Proto['dbType']) => React.ReactNode | undefined;
|
|
6
18
|
collectionRenderer: (dbKey: Proto['dbKey']) => React.ReactNode | undefined;
|
package/types.js
CHANGED
|
@@ -1 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
/*
|
|
2
|
+
* @nu-art/conflict-resolution-shared - Conflict resolution item and renderer types
|
|
3
|
+
* Copyright (C) 2026 Adam van der Kruk aka TacB0sS
|
|
4
|
+
* Licensed under the Apache License, Version 2.0
|
|
5
|
+
*/
|
|
6
|
+
export const DBEntityDependencyErrorType = 'entity-has-dependencies';
|