@sudocode-ai/cli 0.1.17 → 0.1.18-dev.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/dist/better-sqlite3-loader.d.ts +9 -0
- package/dist/better-sqlite3-loader.d.ts.map +1 -0
- package/dist/better-sqlite3-loader.js +24 -0
- package/dist/better-sqlite3-loader.js.map +1 -0
- package/dist/cli/merge-commands.d.ts.map +1 -1
- package/dist/cli/merge-commands.js +290 -15
- package/dist/cli/merge-commands.js.map +1 -1
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/db.d.ts +1 -1
- package/dist/db.d.ts.map +1 -1
- package/dist/db.js +2 -2
- package/dist/db.js.map +1 -1
- package/dist/git-merge.d.ts +88 -0
- package/dist/git-merge.d.ts.map +1 -0
- package/dist/git-merge.js +214 -0
- package/dist/git-merge.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/merge-resolver.d.ts +73 -1
- package/dist/merge-resolver.d.ts.map +1 -1
- package/dist/merge-resolver.js +420 -5
- package/dist/merge-resolver.js.map +1 -1
- package/dist/watcher.d.ts +6 -0
- package/dist/watcher.d.ts.map +1 -1
- package/dist/watcher.js +15 -1
- package/dist/watcher.js.map +1 -1
- package/dist/yaml-conflict-resolver.d.ts +91 -0
- package/dist/yaml-conflict-resolver.d.ts.map +1 -0
- package/dist/yaml-conflict-resolver.js +197 -0
- package/dist/yaml-conflict-resolver.js.map +1 -0
- package/dist/yaml-converter.d.ts +68 -0
- package/dist/yaml-converter.d.ts.map +1 -0
- package/dist/yaml-converter.js +109 -0
- package/dist/yaml-converter.js.map +1 -0
- package/package.json +9 -3
package/dist/watcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"watcher.js","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* YAML Conflict Resolver
|
|
3
|
+
*
|
|
4
|
+
* Parses YAML conflict markers from git merge-file output and applies
|
|
5
|
+
* latest-wins strategy based on `updated_at` timestamps.
|
|
6
|
+
*
|
|
7
|
+
* This resolver handles conflicts that git merge-file couldn't auto-resolve
|
|
8
|
+
* (when both sides modified the same line). It uses timestamp comparison to
|
|
9
|
+
* determine which version to keep.
|
|
10
|
+
*/
|
|
11
|
+
/**
|
|
12
|
+
* Represents a conflict section in YAML
|
|
13
|
+
*/
|
|
14
|
+
export interface ConflictSection {
|
|
15
|
+
/** The "ours" version (current/local changes) */
|
|
16
|
+
ours: string;
|
|
17
|
+
/** The "theirs" version (incoming changes) */
|
|
18
|
+
theirs: string;
|
|
19
|
+
/** The line number where the conflict starts */
|
|
20
|
+
startLine: number;
|
|
21
|
+
/** The line number where the conflict ends */
|
|
22
|
+
endLine: number;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Result of conflict resolution
|
|
26
|
+
*/
|
|
27
|
+
export interface ResolveResult {
|
|
28
|
+
/** Whether any conflicts were found */
|
|
29
|
+
hasConflicts: boolean;
|
|
30
|
+
/** The resolved content (conflict markers replaced with winning values) */
|
|
31
|
+
content: string;
|
|
32
|
+
/** Number of conflicts resolved */
|
|
33
|
+
conflictsResolved: number;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Parse git conflict markers from YAML content
|
|
37
|
+
*
|
|
38
|
+
* Git conflict format:
|
|
39
|
+
* <<<<<<< HEAD (or ours)
|
|
40
|
+
* ... our version ...
|
|
41
|
+
* =======
|
|
42
|
+
* ... their version ...
|
|
43
|
+
* >>>>>>> branch-name (or theirs)
|
|
44
|
+
*
|
|
45
|
+
* @param content - YAML content with conflict markers
|
|
46
|
+
* @returns Array of conflict sections
|
|
47
|
+
*/
|
|
48
|
+
export declare function parseConflicts(content: string): ConflictSection[];
|
|
49
|
+
/**
|
|
50
|
+
* Resolve a single conflict using latest-wins strategy
|
|
51
|
+
*
|
|
52
|
+
* Compares updated_at timestamps from both versions and returns the newer one.
|
|
53
|
+
* If timestamps are missing or invalid, treats that version as oldest.
|
|
54
|
+
* If timestamps are identical, prefers "ours" for stability.
|
|
55
|
+
*
|
|
56
|
+
* @param conflict - The conflict section to resolve
|
|
57
|
+
* @param globalOursTimestamp - Optional global timestamp for "ours" (from original entity)
|
|
58
|
+
* @param globalTheirsTimestamp - Optional global timestamp for "theirs" (from original entity)
|
|
59
|
+
* @returns The winning YAML content
|
|
60
|
+
*/
|
|
61
|
+
export declare function resolveConflict(conflict: ConflictSection, globalOursTimestamp?: Date | null, globalTheirsTimestamp?: Date | null): string;
|
|
62
|
+
/**
|
|
63
|
+
* Resolve all conflicts in YAML content using latest-wins strategy
|
|
64
|
+
*
|
|
65
|
+
* Parses conflict markers, compares updated_at timestamps, and replaces
|
|
66
|
+
* each conflict section with the winning version.
|
|
67
|
+
*
|
|
68
|
+
* @param content - YAML content with conflict markers
|
|
69
|
+
* @returns ResolveResult with resolved content and stats
|
|
70
|
+
*
|
|
71
|
+
* @example
|
|
72
|
+
* ```typescript
|
|
73
|
+
* const yamlWithConflicts = `
|
|
74
|
+
* id: i-abc123
|
|
75
|
+
* <<<<<<< HEAD
|
|
76
|
+
* title: Updated Title
|
|
77
|
+
* updated_at: 2025-01-02T10:00:00Z
|
|
78
|
+
* =======
|
|
79
|
+
* title: Different Title
|
|
80
|
+
* updated_at: 2025-01-01T10:00:00Z
|
|
81
|
+
* >>>>>>> theirs
|
|
82
|
+
* status: open
|
|
83
|
+
* `;
|
|
84
|
+
*
|
|
85
|
+
* const result = resolveConflicts(yamlWithConflicts);
|
|
86
|
+
* // result.content contains "title: Updated Title" (newer timestamp wins)
|
|
87
|
+
* // result.conflictsResolved === 1
|
|
88
|
+
* ```
|
|
89
|
+
*/
|
|
90
|
+
export declare function resolveConflicts(content: string, oursUpdatedAt?: string, theirsUpdatedAt?: string): ResolveResult;
|
|
91
|
+
//# sourceMappingURL=yaml-conflict-resolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-conflict-resolver.d.ts","sourceRoot":"","sources":["../src/yaml-conflict-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,uCAAuC;IACvC,YAAY,EAAE,OAAO,CAAC;IACtB,2EAA2E;IAC3E,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAwCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CAgDjE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EACzB,mBAAmB,CAAC,EAAE,IAAI,GAAG,IAAI,EACjC,qBAAqB,CAAC,EAAE,IAAI,GAAG,IAAI,GAClC,MAAM,CA4BR;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,MAAM,EACtB,eAAe,CAAC,EAAE,MAAM,GACvB,aAAa,CAuCf"}
|
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* YAML Conflict Resolver
|
|
3
|
+
*
|
|
4
|
+
* Parses YAML conflict markers from git merge-file output and applies
|
|
5
|
+
* latest-wins strategy based on `updated_at` timestamps.
|
|
6
|
+
*
|
|
7
|
+
* This resolver handles conflicts that git merge-file couldn't auto-resolve
|
|
8
|
+
* (when both sides modified the same line). It uses timestamp comparison to
|
|
9
|
+
* determine which version to keep.
|
|
10
|
+
*/
|
|
11
|
+
/**
|
|
12
|
+
* Extract updated_at timestamp from a YAML section
|
|
13
|
+
*
|
|
14
|
+
* Looks for lines like:
|
|
15
|
+
* - updated_at: 2025-01-01T10:00:00Z
|
|
16
|
+
* - updated_at: "2025-01-01 10:00:00"
|
|
17
|
+
* - updated_at: '2025-01-01T10:00:00.000Z'
|
|
18
|
+
*
|
|
19
|
+
* @param yamlSection - YAML content to search
|
|
20
|
+
* @returns Date object or null if not found/invalid
|
|
21
|
+
*/
|
|
22
|
+
function extractTimestamp(yamlSection) {
|
|
23
|
+
// Match updated_at field with various timestamp formats
|
|
24
|
+
// Handles quoted and unquoted ISO 8601 timestamps
|
|
25
|
+
const timestampRegex = /updated_at:\s*['"]?([^'"{\n]+?)['"]?\s*$/m;
|
|
26
|
+
const match = yamlSection.match(timestampRegex);
|
|
27
|
+
if (!match || !match[1]) {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
const timestampStr = match[1].trim();
|
|
31
|
+
try {
|
|
32
|
+
// Parse ISO 8601 timestamp
|
|
33
|
+
const date = new Date(timestampStr);
|
|
34
|
+
// Check if date is valid
|
|
35
|
+
if (isNaN(date.getTime())) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
38
|
+
return date;
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return null;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Parse git conflict markers from YAML content
|
|
46
|
+
*
|
|
47
|
+
* Git conflict format:
|
|
48
|
+
* <<<<<<< HEAD (or ours)
|
|
49
|
+
* ... our version ...
|
|
50
|
+
* =======
|
|
51
|
+
* ... their version ...
|
|
52
|
+
* >>>>>>> branch-name (or theirs)
|
|
53
|
+
*
|
|
54
|
+
* @param content - YAML content with conflict markers
|
|
55
|
+
* @returns Array of conflict sections
|
|
56
|
+
*/
|
|
57
|
+
export function parseConflicts(content) {
|
|
58
|
+
const conflicts = [];
|
|
59
|
+
const lines = content.split('\n');
|
|
60
|
+
let i = 0;
|
|
61
|
+
while (i < lines.length) {
|
|
62
|
+
const line = lines[i];
|
|
63
|
+
// Look for conflict start marker
|
|
64
|
+
if (line.startsWith('<<<<<<<')) {
|
|
65
|
+
const startLine = i;
|
|
66
|
+
const oursLines = [];
|
|
67
|
+
const theirsLines = [];
|
|
68
|
+
// Advance to collect "ours" section
|
|
69
|
+
i++;
|
|
70
|
+
while (i < lines.length && !lines[i].startsWith('=======')) {
|
|
71
|
+
oursLines.push(lines[i]);
|
|
72
|
+
i++;
|
|
73
|
+
}
|
|
74
|
+
// Skip the separator
|
|
75
|
+
if (i < lines.length && lines[i].startsWith('=======')) {
|
|
76
|
+
i++;
|
|
77
|
+
}
|
|
78
|
+
// Collect "theirs" section
|
|
79
|
+
while (i < lines.length && !lines[i].startsWith('>>>>>>>')) {
|
|
80
|
+
theirsLines.push(lines[i]);
|
|
81
|
+
i++;
|
|
82
|
+
}
|
|
83
|
+
// Record end line
|
|
84
|
+
const endLine = i;
|
|
85
|
+
// Add conflict section
|
|
86
|
+
conflicts.push({
|
|
87
|
+
ours: oursLines.join('\n'),
|
|
88
|
+
theirs: theirsLines.join('\n'),
|
|
89
|
+
startLine,
|
|
90
|
+
endLine,
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
i++;
|
|
94
|
+
}
|
|
95
|
+
return conflicts;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* Resolve a single conflict using latest-wins strategy
|
|
99
|
+
*
|
|
100
|
+
* Compares updated_at timestamps from both versions and returns the newer one.
|
|
101
|
+
* If timestamps are missing or invalid, treats that version as oldest.
|
|
102
|
+
* If timestamps are identical, prefers "ours" for stability.
|
|
103
|
+
*
|
|
104
|
+
* @param conflict - The conflict section to resolve
|
|
105
|
+
* @param globalOursTimestamp - Optional global timestamp for "ours" (from original entity)
|
|
106
|
+
* @param globalTheirsTimestamp - Optional global timestamp for "theirs" (from original entity)
|
|
107
|
+
* @returns The winning YAML content
|
|
108
|
+
*/
|
|
109
|
+
export function resolveConflict(conflict, globalOursTimestamp, globalTheirsTimestamp) {
|
|
110
|
+
// Try to extract timestamp from conflict section first, fallback to global timestamp
|
|
111
|
+
const oursTimestamp = extractTimestamp(conflict.ours) ?? globalOursTimestamp;
|
|
112
|
+
const theirsTimestamp = extractTimestamp(conflict.theirs) ?? globalTheirsTimestamp;
|
|
113
|
+
// If neither has a valid timestamp, prefer ours for stability
|
|
114
|
+
if (!oursTimestamp && !theirsTimestamp) {
|
|
115
|
+
return conflict.ours;
|
|
116
|
+
}
|
|
117
|
+
// If only one has a valid timestamp, it wins
|
|
118
|
+
if (!oursTimestamp && theirsTimestamp) {
|
|
119
|
+
return conflict.theirs;
|
|
120
|
+
}
|
|
121
|
+
if (oursTimestamp && !theirsTimestamp) {
|
|
122
|
+
return conflict.ours;
|
|
123
|
+
}
|
|
124
|
+
// Both have valid timestamps - compare them
|
|
125
|
+
// TypeScript knows both are non-null here due to above checks
|
|
126
|
+
if (oursTimestamp.getTime() > theirsTimestamp.getTime()) {
|
|
127
|
+
return conflict.ours;
|
|
128
|
+
}
|
|
129
|
+
else if (theirsTimestamp.getTime() > oursTimestamp.getTime()) {
|
|
130
|
+
return conflict.theirs;
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
// Timestamps are identical - prefer ours for stability
|
|
134
|
+
return conflict.ours;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
/**
|
|
138
|
+
* Resolve all conflicts in YAML content using latest-wins strategy
|
|
139
|
+
*
|
|
140
|
+
* Parses conflict markers, compares updated_at timestamps, and replaces
|
|
141
|
+
* each conflict section with the winning version.
|
|
142
|
+
*
|
|
143
|
+
* @param content - YAML content with conflict markers
|
|
144
|
+
* @returns ResolveResult with resolved content and stats
|
|
145
|
+
*
|
|
146
|
+
* @example
|
|
147
|
+
* ```typescript
|
|
148
|
+
* const yamlWithConflicts = `
|
|
149
|
+
* id: i-abc123
|
|
150
|
+
* <<<<<<< HEAD
|
|
151
|
+
* title: Updated Title
|
|
152
|
+
* updated_at: 2025-01-02T10:00:00Z
|
|
153
|
+
* =======
|
|
154
|
+
* title: Different Title
|
|
155
|
+
* updated_at: 2025-01-01T10:00:00Z
|
|
156
|
+
* >>>>>>> theirs
|
|
157
|
+
* status: open
|
|
158
|
+
* `;
|
|
159
|
+
*
|
|
160
|
+
* const result = resolveConflicts(yamlWithConflicts);
|
|
161
|
+
* // result.content contains "title: Updated Title" (newer timestamp wins)
|
|
162
|
+
* // result.conflictsResolved === 1
|
|
163
|
+
* ```
|
|
164
|
+
*/
|
|
165
|
+
export function resolveConflicts(content, oursUpdatedAt, theirsUpdatedAt) {
|
|
166
|
+
const conflicts = parseConflicts(content);
|
|
167
|
+
if (conflicts.length === 0) {
|
|
168
|
+
return {
|
|
169
|
+
hasConflicts: false,
|
|
170
|
+
content,
|
|
171
|
+
conflictsResolved: 0,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
// Parse global timestamps if provided (used as fallback when block doesn't have timestamp)
|
|
175
|
+
const globalOursTimestamp = oursUpdatedAt ? new Date(oursUpdatedAt) : null;
|
|
176
|
+
const globalTheirsTimestamp = theirsUpdatedAt ? new Date(theirsUpdatedAt) : null;
|
|
177
|
+
// Process conflicts in reverse order to maintain line numbers
|
|
178
|
+
const lines = content.split('\n');
|
|
179
|
+
let resolvedCount = 0;
|
|
180
|
+
for (let i = conflicts.length - 1; i >= 0; i--) {
|
|
181
|
+
const conflict = conflicts[i];
|
|
182
|
+
const resolvedContent = resolveConflict(conflict, globalOursTimestamp, globalTheirsTimestamp);
|
|
183
|
+
// Replace conflict section with resolved content
|
|
184
|
+
// Split resolved content into lines for splicing
|
|
185
|
+
const resolvedLines = resolvedContent.split('\n');
|
|
186
|
+
// Remove conflict markers and content, insert resolved version
|
|
187
|
+
// +1 to include the end marker line
|
|
188
|
+
lines.splice(conflict.startLine, conflict.endLine - conflict.startLine + 1, ...resolvedLines);
|
|
189
|
+
resolvedCount++;
|
|
190
|
+
}
|
|
191
|
+
return {
|
|
192
|
+
hasConflicts: true,
|
|
193
|
+
content: lines.join('\n'),
|
|
194
|
+
conflictsResolved: resolvedCount,
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=yaml-conflict-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-conflict-resolver.js","sourceRoot":"","sources":["../src/yaml-conflict-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* YAML Converter for Sudocode entities
|
|
3
|
+
*
|
|
4
|
+
* Provides deterministic JSON ↔ YAML conversion with:
|
|
5
|
+
* - Literal style (|) for multi-line strings (enables line-based git merging)
|
|
6
|
+
* - Plain style for simple scalars
|
|
7
|
+
* - Block style for arrays (one item per line)
|
|
8
|
+
* - Deterministic formatting (2-space indent, LF line endings)
|
|
9
|
+
* - Lossless round-trip conversion
|
|
10
|
+
*/
|
|
11
|
+
export interface YamlConverterOptions {
|
|
12
|
+
/**
|
|
13
|
+
* Indent size for YAML output (default: 2)
|
|
14
|
+
*/
|
|
15
|
+
indent?: number;
|
|
16
|
+
/**
|
|
17
|
+
* Line width for wrapping (default: -1 for no wrapping)
|
|
18
|
+
* Setting to -1 ensures js-yaml uses literal style (|-) for multi-line strings
|
|
19
|
+
* instead of folded style (>-), which is critical for preserving newlines in git merging.
|
|
20
|
+
*/
|
|
21
|
+
lineWidth?: number;
|
|
22
|
+
/**
|
|
23
|
+
* Minimum length for literal style multi-line strings (default: 60)
|
|
24
|
+
* Strings with newlines shorter than this may use quoted style instead
|
|
25
|
+
*/
|
|
26
|
+
literalMinLength?: number;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Convert a JSON object to YAML string
|
|
30
|
+
*
|
|
31
|
+
* @param obj - The object to convert
|
|
32
|
+
* @param options - Conversion options
|
|
33
|
+
* @returns YAML string with deterministic formatting
|
|
34
|
+
*/
|
|
35
|
+
export declare function toYaml(obj: any, options?: YamlConverterOptions): string;
|
|
36
|
+
/**
|
|
37
|
+
* Convert a YAML string to JSON object
|
|
38
|
+
*
|
|
39
|
+
* @param yamlString - The YAML string to parse
|
|
40
|
+
* @returns Parsed JavaScript object
|
|
41
|
+
* @throws {yaml.YAMLException} If YAML is invalid
|
|
42
|
+
*/
|
|
43
|
+
export declare function fromYaml(yamlString: string): any;
|
|
44
|
+
/**
|
|
45
|
+
* Verify that an object can round-trip through YAML without data loss
|
|
46
|
+
*
|
|
47
|
+
* @param obj - The object to test
|
|
48
|
+
* @param options - Conversion options
|
|
49
|
+
* @returns True if round-trip preserves all data
|
|
50
|
+
*/
|
|
51
|
+
export declare function verifyRoundTrip(obj: any, options?: YamlConverterOptions): boolean;
|
|
52
|
+
/**
|
|
53
|
+
* Convert multiple JSON objects to YAML documents in a single file
|
|
54
|
+
* Uses YAML document separator (---) between objects
|
|
55
|
+
*
|
|
56
|
+
* @param objects - Array of objects to convert
|
|
57
|
+
* @param options - Conversion options
|
|
58
|
+
* @returns YAML string with multiple documents
|
|
59
|
+
*/
|
|
60
|
+
export declare function toYamlDocuments(objects: any[], options?: YamlConverterOptions): string;
|
|
61
|
+
/**
|
|
62
|
+
* Parse multiple YAML documents from a single file
|
|
63
|
+
*
|
|
64
|
+
* @param yamlString - YAML string with multiple documents
|
|
65
|
+
* @returns Array of parsed objects
|
|
66
|
+
*/
|
|
67
|
+
export declare function fromYamlDocuments(yamlString: string): any[];
|
|
68
|
+
//# sourceMappingURL=yaml-converter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-converter.d.ts","sourceRoot":"","sources":["../src/yaml-converter.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAyBD;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,oBAAyB,GAAG,MAAM,CAyB3E;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAQhD;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAUrF;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,OAAO,GAAE,oBAAyB,GAAG,MAAM,CAa1F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,EAAE,CAQ3D"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import yaml from 'js-yaml';
|
|
2
|
+
/**
|
|
3
|
+
* Determine the best YAML style for a string value
|
|
4
|
+
*/
|
|
5
|
+
function getStringStyle(value, literalMinLength = 60) {
|
|
6
|
+
// Empty strings use plain style
|
|
7
|
+
if (value.length === 0) {
|
|
8
|
+
return 'plain';
|
|
9
|
+
}
|
|
10
|
+
// Strings with newlines use literal style for git-friendly line-based merging
|
|
11
|
+
if (value.includes('\n')) {
|
|
12
|
+
return 'literal';
|
|
13
|
+
}
|
|
14
|
+
// Single-line strings use plain style (js-yaml handles quoting automatically)
|
|
15
|
+
return 'plain';
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Convert a JSON object to YAML string
|
|
19
|
+
*
|
|
20
|
+
* @param obj - The object to convert
|
|
21
|
+
* @param options - Conversion options
|
|
22
|
+
* @returns YAML string with deterministic formatting
|
|
23
|
+
*/
|
|
24
|
+
export function toYaml(obj, options = {}) {
|
|
25
|
+
const { indent = 2, lineWidth = -1, literalMinLength = 60, } = options;
|
|
26
|
+
const yamlString = yaml.dump(obj, {
|
|
27
|
+
indent,
|
|
28
|
+
lineWidth,
|
|
29
|
+
noRefs: true, // Don't use YAML anchors/aliases
|
|
30
|
+
sortKeys: false, // Preserve key order
|
|
31
|
+
noCompatMode: true, // Use YAML 1.2
|
|
32
|
+
// Custom style function for strings
|
|
33
|
+
styles: {
|
|
34
|
+
'!!str': (value) => getStringStyle(value, literalMinLength),
|
|
35
|
+
},
|
|
36
|
+
// Don't wrap long lines in literal strings
|
|
37
|
+
flowLevel: -1,
|
|
38
|
+
}); // Use 'as any' to bypass type checking for extended options
|
|
39
|
+
// Ensure trailing newline
|
|
40
|
+
return yamlString.endsWith('\n') ? yamlString : yamlString + '\n';
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Convert a YAML string to JSON object
|
|
44
|
+
*
|
|
45
|
+
* @param yamlString - The YAML string to parse
|
|
46
|
+
* @returns Parsed JavaScript object
|
|
47
|
+
* @throws {yaml.YAMLException} If YAML is invalid
|
|
48
|
+
*/
|
|
49
|
+
export function fromYaml(yamlString) {
|
|
50
|
+
if (!yamlString || yamlString.trim() === '') {
|
|
51
|
+
return null;
|
|
52
|
+
}
|
|
53
|
+
return yaml.load(yamlString, {
|
|
54
|
+
schema: yaml.JSON_SCHEMA, // Use JSON-compatible schema
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Verify that an object can round-trip through YAML without data loss
|
|
59
|
+
*
|
|
60
|
+
* @param obj - The object to test
|
|
61
|
+
* @param options - Conversion options
|
|
62
|
+
* @returns True if round-trip preserves all data
|
|
63
|
+
*/
|
|
64
|
+
export function verifyRoundTrip(obj, options = {}) {
|
|
65
|
+
try {
|
|
66
|
+
const yamlStr = toYaml(obj, options);
|
|
67
|
+
const parsed = fromYaml(yamlStr);
|
|
68
|
+
// Deep equality check
|
|
69
|
+
return JSON.stringify(obj) === JSON.stringify(parsed);
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Convert multiple JSON objects to YAML documents in a single file
|
|
77
|
+
* Uses YAML document separator (---) between objects
|
|
78
|
+
*
|
|
79
|
+
* @param objects - Array of objects to convert
|
|
80
|
+
* @param options - Conversion options
|
|
81
|
+
* @returns YAML string with multiple documents
|
|
82
|
+
*/
|
|
83
|
+
export function toYamlDocuments(objects, options = {}) {
|
|
84
|
+
if (objects.length === 0) {
|
|
85
|
+
return '';
|
|
86
|
+
}
|
|
87
|
+
const documents = objects.map(obj => {
|
|
88
|
+
const yamlStr = toYaml(obj, options);
|
|
89
|
+
// Remove trailing newline for joining
|
|
90
|
+
return yamlStr.replace(/\n$/, '');
|
|
91
|
+
});
|
|
92
|
+
// Join with document separator
|
|
93
|
+
return documents.join('\n---\n') + '\n';
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Parse multiple YAML documents from a single file
|
|
97
|
+
*
|
|
98
|
+
* @param yamlString - YAML string with multiple documents
|
|
99
|
+
* @returns Array of parsed objects
|
|
100
|
+
*/
|
|
101
|
+
export function fromYamlDocuments(yamlString) {
|
|
102
|
+
if (!yamlString || yamlString.trim() === '') {
|
|
103
|
+
return [];
|
|
104
|
+
}
|
|
105
|
+
return yaml.loadAll(yamlString, undefined, {
|
|
106
|
+
schema: yaml.JSON_SCHEMA,
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=yaml-converter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yaml-converter.js","sourceRoot":"","sources":["../src/yaml-converter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sudocode-ai/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.18-dev.0",
|
|
4
4
|
"description": "Git-native spec and issue management CLI for AI-assisted software development",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -47,18 +47,20 @@
|
|
|
47
47
|
"node": ">=18.0.0"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@sudocode-ai/types": "^0.1.
|
|
50
|
+
"@sudocode-ai/types": "^0.1.18-dev.0",
|
|
51
51
|
"better-sqlite3": "^11.10.0",
|
|
52
52
|
"chalk": "^5.6.2",
|
|
53
53
|
"chokidar": "^4.0.3",
|
|
54
54
|
"cli-table3": "^0.6.5",
|
|
55
55
|
"commander": "^13.1.0",
|
|
56
56
|
"gray-matter": "^4.0.3",
|
|
57
|
+
"js-yaml": "^4.1.1",
|
|
57
58
|
"vite": "^6.4.1"
|
|
58
59
|
},
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@types/better-sqlite3": "^7.6.13",
|
|
61
62
|
"@types/chokidar": "^1.7.5",
|
|
63
|
+
"@types/js-yaml": "^4.0.9",
|
|
62
64
|
"@types/node": "^20.10.6",
|
|
63
65
|
"esbuild": "^0.27.0",
|
|
64
66
|
"typescript": "^5.3.3",
|
|
@@ -68,6 +70,10 @@
|
|
|
68
70
|
"dist/**/*"
|
|
69
71
|
],
|
|
70
72
|
"optionalDependencies": {
|
|
71
|
-
"
|
|
73
|
+
"@sudocode-ai/better-sqlite3-linux-x64": "11.10.0",
|
|
74
|
+
"@sudocode-ai/better-sqlite3-linux-arm64": "11.10.0",
|
|
75
|
+
"@sudocode-ai/better-sqlite3-darwin-x64": "11.10.0",
|
|
76
|
+
"@sudocode-ai/better-sqlite3-darwin-arm64": "11.10.0",
|
|
77
|
+
"@sudocode-ai/better-sqlite3-win32-x64": "11.10.0"
|
|
72
78
|
}
|
|
73
79
|
}
|