@foss.global/interfaces 0.9.0 → 0.10.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/changelog.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Changelog
2
2
 
3
+ ## 2026-07-21 - 0.10.0
4
+
5
+ ### Features
6
+
7
+ - add atomic GitManager merge contracts (gitmanager-merge)
8
+ - Add exact source and expected-target object fencing for merge, squash, and rebase execution.
9
+ - Return explicit merged, already-merged, conflicting, and stale outcomes without requiring error parsing.
10
+
3
11
  ## 2026-07-21 - 0.9.0
4
12
 
5
13
  ### Features
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@foss.global/interfaces',
6
- version: '0.9.0',
6
+ version: '0.10.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the foss.global Git platform ecosystem.'
8
8
  };
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFHQUFxRztDQUNuSCxDQUFBIn0=
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLHFHQUFxRztDQUNuSCxDQUFBIn0=
@@ -29,6 +29,27 @@ export interface IGitManagerRef extends IGitManagerRepositorySelector {
29
29
  }
30
30
  export interface IGitManagerRefRequest extends IGitManagerRepositorySelector {
31
31
  }
32
+ export type TGitManagerMergeMethod = 'merge' | 'squash' | 'rebase';
33
+ export type TGitManagerMergeStatus = 'merged' | 'already_merged' | 'conflicting' | 'stale';
34
+ export interface IGitManagerMergeRequest extends IGitManagerRepositorySelector {
35
+ targetRef: string;
36
+ sourceObjectId: string;
37
+ expectedTargetObjectId: string;
38
+ method: TGitManagerMergeMethod;
39
+ title: string;
40
+ message: string;
41
+ actorName: string;
42
+ actorEmail: string;
43
+ }
44
+ export interface IGitManagerMergeResult extends IGitManagerRepositorySelector {
45
+ status: TGitManagerMergeStatus;
46
+ method: TGitManagerMergeMethod;
47
+ targetRef: string;
48
+ sourceObjectId: string;
49
+ targetObjectIdBefore: string;
50
+ targetObjectIdAfter: string;
51
+ mergeCommitId: string | null;
52
+ }
32
53
  export interface IGitManagerTreeRequest extends IGitManagerRepositorySelector {
33
54
  ref?: string;
34
55
  path?: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@foss.global/interfaces",
3
- "version": "0.9.0",
3
+ "version": "0.10.0",
4
4
  "private": false,
5
5
  "description": "Shared TypeScript interfaces and TypedRequest contracts for the foss.global Git platform ecosystem.",
6
6
  "exports": {
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@foss.global/interfaces',
6
- version: '0.9.0',
6
+ version: '0.10.0',
7
7
  description: 'Shared TypeScript interfaces and TypedRequest contracts for the foss.global Git platform ecosystem.'
8
8
  }
@@ -47,6 +47,35 @@ export interface IGitManagerRef extends IGitManagerRepositorySelector {
47
47
 
48
48
  export interface IGitManagerRefRequest extends IGitManagerRepositorySelector {}
49
49
 
50
+ export type TGitManagerMergeMethod = 'merge' | 'squash' | 'rebase';
51
+
52
+ export type TGitManagerMergeStatus =
53
+ | 'merged'
54
+ | 'already_merged'
55
+ | 'conflicting'
56
+ | 'stale';
57
+
58
+ export interface IGitManagerMergeRequest extends IGitManagerRepositorySelector {
59
+ targetRef: string;
60
+ sourceObjectId: string;
61
+ expectedTargetObjectId: string;
62
+ method: TGitManagerMergeMethod;
63
+ title: string;
64
+ message: string;
65
+ actorName: string;
66
+ actorEmail: string;
67
+ }
68
+
69
+ export interface IGitManagerMergeResult extends IGitManagerRepositorySelector {
70
+ status: TGitManagerMergeStatus;
71
+ method: TGitManagerMergeMethod;
72
+ targetRef: string;
73
+ sourceObjectId: string;
74
+ targetObjectIdBefore: string;
75
+ targetObjectIdAfter: string;
76
+ mergeCommitId: string | null;
77
+ }
78
+
50
79
  export interface IGitManagerTreeRequest extends IGitManagerRepositorySelector {
51
80
  ref?: string;
52
81
  path?: string;