@codyswann/lisa 1.2.0 → 1.3.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.
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { FileOperationResult } from "../core/config.js";
|
|
2
2
|
import type { ICopyStrategy, StrategyContext } from "./strategy.interface.js";
|
|
3
3
|
/**
|
|
4
|
-
* Merge strategy: Deep merge JSON files (
|
|
5
|
-
* -
|
|
6
|
-
* -
|
|
4
|
+
* Merge strategy: Deep merge JSON files (Lisa values take precedence)
|
|
5
|
+
* - Project values serve as defaults
|
|
6
|
+
* - Lisa values take precedence on conflicts
|
|
7
7
|
* - Handle nested paths (.claude/settings.json)
|
|
8
8
|
*/
|
|
9
9
|
export declare class MergeStrategy implements ICopyStrategy {
|
package/dist/strategies/merge.js
CHANGED
|
@@ -4,9 +4,9 @@ import { ensureParentDir } from "../utils/file-operations.js";
|
|
|
4
4
|
import { readJson, writeJson, deepMerge } from "../utils/json-utils.js";
|
|
5
5
|
import { JsonMergeError } from "../errors/index.js";
|
|
6
6
|
/**
|
|
7
|
-
* Merge strategy: Deep merge JSON files (
|
|
8
|
-
* -
|
|
9
|
-
* -
|
|
7
|
+
* Merge strategy: Deep merge JSON files (Lisa values take precedence)
|
|
8
|
+
* - Project values serve as defaults
|
|
9
|
+
* - Lisa values take precedence on conflicts
|
|
10
10
|
* - Handle nested paths (.claude/settings.json)
|
|
11
11
|
*/
|
|
12
12
|
export class MergeStrategy {
|
|
@@ -38,8 +38,8 @@ export class MergeStrategy {
|
|
|
38
38
|
const destJson = await readJson(destPath).catch(() => {
|
|
39
39
|
throw new JsonMergeError(relativePath, `Failed to parse destination: ${destPath}`);
|
|
40
40
|
});
|
|
41
|
-
// Deep merge: Lisa (source)
|
|
42
|
-
const merged = deepMerge(
|
|
41
|
+
// Deep merge: Lisa (source) takes precedence, project (dest) provides defaults
|
|
42
|
+
const merged = deepMerge(destJson, sourceJson);
|
|
43
43
|
// Normalize for comparison (parse and re-stringify both)
|
|
44
44
|
const normalizedDest = JSON.stringify(destJson, null, 2);
|
|
45
45
|
const normalizedMerged = JSON.stringify(merged, null, 2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/strategies/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,OAAO,aAAa;IACf,IAAI,GAAG,OAAgB,CAAC;IAEjC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,CACT,UAAkB,EAClB,QAAgB,EAChB,YAAoB,EACpB,OAAwB;QAExB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,4CAA4C;YAC5C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAChC,MAAM,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACrC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACjE,CAAC;QAED,gCAAgC;QAChC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAS,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/D,MAAM,IAAI,cAAc,CACtB,YAAY,EACZ,2BAA2B,UAAU,EAAE,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAS,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC3D,MAAM,IAAI,cAAc,CACtB,YAAY,EACZ,gCAAgC,QAAQ,EAAE,CAC3C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/strategies/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,OAAO,aAAa;IACf,IAAI,GAAG,OAAgB,CAAC;IAEjC;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,CACT,UAAkB,EAClB,QAAgB,EAChB,YAAoB,EACpB,OAAwB;QAExB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,4CAA4C;YAC5C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAChC,MAAM,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACrC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QACjE,CAAC;QAED,gCAAgC;QAChC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAS,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/D,MAAM,IAAI,cAAc,CACtB,YAAY,EACZ,2BAA2B,UAAU,EAAE,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAS,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC3D,MAAM,IAAI,cAAc,CACtB,YAAY,EACZ,gCAAgC,QAAQ,EAAE,CAC3C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE/C,yDAAyD;QACzD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEzD,IAAI,cAAc,KAAK,gBAAgB,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC3B,MAAM,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAClC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IACjE,CAAC;CACF"}
|
|
@@ -24,11 +24,11 @@ export declare function writeJson(filePath: string, data: unknown, spaces?: numb
|
|
|
24
24
|
*/
|
|
25
25
|
export declare function isValidJson(filePath: string): Promise<boolean>;
|
|
26
26
|
/**
|
|
27
|
-
* Deep merge two objects (
|
|
27
|
+
* Deep merge two objects (Lisa values take precedence on conflicts)
|
|
28
28
|
* Uses lodash.merge for deep merging
|
|
29
|
-
* @param base Base object
|
|
30
|
-
* @param override Override object with precedence
|
|
31
|
-
* @returns Merged object
|
|
29
|
+
* @param base Base object (project values)
|
|
30
|
+
* @param override Override object with precedence (Lisa values)
|
|
31
|
+
* @returns Merged object with Lisa values winning conflicts
|
|
32
32
|
*/
|
|
33
33
|
export declare function deepMerge<T extends object>(base: T, override: T): T;
|
|
34
34
|
//# sourceMappingURL=json-utils.d.ts.map
|
package/dist/utils/json-utils.js
CHANGED
|
@@ -56,11 +56,11 @@ export async function isValidJson(filePath) {
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
/**
|
|
59
|
-
* Deep merge two objects (
|
|
59
|
+
* Deep merge two objects (Lisa values take precedence on conflicts)
|
|
60
60
|
* Uses lodash.merge for deep merging
|
|
61
|
-
* @param base Base object
|
|
62
|
-
* @param override Override object with precedence
|
|
63
|
-
* @returns Merged object
|
|
61
|
+
* @param base Base object (project values)
|
|
62
|
+
* @param override Override object with precedence (Lisa values)
|
|
63
|
+
* @returns Merged object with Lisa values winning conflicts
|
|
64
64
|
*/
|
|
65
65
|
export function deepMerge(base, override) {
|
|
66
66
|
// Create a new object to avoid mutating inputs
|
package/package.json
CHANGED
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@ast-grep/cli"
|
|
80
80
|
],
|
|
81
81
|
"name": "@codyswann/lisa",
|
|
82
|
-
"version": "1.
|
|
82
|
+
"version": "1.3.0",
|
|
83
83
|
"description": "Claude Code governance framework that applies guardrails, guidance, and automated enforcement to projects",
|
|
84
84
|
"main": "dist/index.js",
|
|
85
85
|
"bin": {
|