@knapsack/source-conflicts-adapter 4.92.2--canary.8f9a09e.0 → 4.92.2--canary.7408.16ee1b4.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/analyzer.d.ts.map +1 -1
- package/dist/analyzer.js +2 -28
- package/dist/analyzer.js.map +1 -1
- package/dist/detect.d.ts +2 -8
- package/dist/detect.d.ts.map +1 -1
- package/dist/detect.js +8 -18
- package/dist/detect.js.map +1 -1
- package/dist/detect.vitest.js +6 -11
- package/dist/detect.vitest.js.map +1 -1
- package/dist/parser.d.ts.map +1 -1
- package/dist/parser.js +16 -22
- package/dist/parser.js.map +1 -1
- package/dist/transformer.d.ts.map +1 -1
- package/dist/transformer.js +18 -26
- package/dist/transformer.js.map +1 -1
- package/package.json +6 -6
package/dist/analyzer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,cAAc,EAEd,6BAA6B,EAC7B,cAAc,EAEf,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,cAAc,EAEd,6BAA6B,EAC7B,cAAc,EAEf,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,UAAU,GAAG,qBAAqB,GAAG;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8DAA8D;IAC9D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,IAAI,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,CAAC,GACvC,OAAO,CAAC,6BAA6B,CAAC,CAkDxC;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,cAAc,GACrB,MAAM,EAAE,CAEV;AAED;;;GAGG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAkCtE"}
|
package/dist/analyzer.js
CHANGED
|
@@ -1,25 +1,11 @@
|
|
|
1
1
|
import * as fs from 'node:fs/promises';
|
|
2
|
-
import { resolveSourceKey } from './types.js';
|
|
3
2
|
import { indexEntitiesDir, findConflictGroups } from './detect.js';
|
|
4
3
|
import { detectMdxConflictBundle, computeDiffsForAllSources, } from './mdx/mdxConflicts.js';
|
|
5
4
|
import { detectJsonConflictBundle } from './json/jsonConflicts.js';
|
|
6
5
|
export async function analyze(config, deps) {
|
|
7
6
|
const { logger } = deps;
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const start = Date.now();
|
|
11
|
-
const logMeta = { siteId, sourceKey };
|
|
12
|
-
logger.info('Source conflicts analyze started', {
|
|
13
|
-
knapsackMeta: { siteId },
|
|
14
|
-
metadata: { sourceKey },
|
|
15
|
-
evt: {
|
|
16
|
-
name: 'sourceConflicts.analyze',
|
|
17
|
-
step: 'start',
|
|
18
|
-
outcome: null,
|
|
19
|
-
},
|
|
20
|
-
});
|
|
21
|
-
const index = await indexEntitiesDir(config.entitiesRootAbs, logger, logMeta);
|
|
22
|
-
const groups = findConflictGroups(index, logger, logMeta);
|
|
7
|
+
const index = await indexEntitiesDir(config.entitiesRootAbs, logger);
|
|
8
|
+
const groups = findConflictGroups(index, logger);
|
|
23
9
|
const groupResults = [];
|
|
24
10
|
const skippedGroupKeys = [];
|
|
25
11
|
for (const group of groups) {
|
|
@@ -54,18 +40,6 @@ export async function analyze(config, deps) {
|
|
|
54
40
|
const anchors = computeDiffsForAllSources(bundle);
|
|
55
41
|
groupResults.push({ group, bundle, anchors });
|
|
56
42
|
}
|
|
57
|
-
logger.info('Source conflicts analyze complete', {
|
|
58
|
-
knapsackMeta: { siteId },
|
|
59
|
-
metadata: { sourceKey },
|
|
60
|
-
evt: {
|
|
61
|
-
name: 'sourceConflicts.analyze',
|
|
62
|
-
step: 'complete',
|
|
63
|
-
outcome: 'success',
|
|
64
|
-
itemCount: groupResults.length,
|
|
65
|
-
skippedCount: skippedGroupKeys.length,
|
|
66
|
-
durationMs: Date.now() - start,
|
|
67
|
-
},
|
|
68
|
-
});
|
|
69
43
|
return { groupResults, skippedGroupKeys };
|
|
70
44
|
}
|
|
71
45
|
/**
|
package/dist/analyzer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAUvC,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"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"}
|
package/dist/detect.d.ts
CHANGED
|
@@ -8,12 +8,6 @@ export type { ArtifactRef, ConflictGroup } from './types.js';
|
|
|
8
8
|
* Same entity = same entityType + same base name (e.g. button.react.mdx or button.react.md);
|
|
9
9
|
* sourceType and hash are read from the filename.
|
|
10
10
|
*/
|
|
11
|
-
export declare function indexEntitiesDir(entitiesRootAbs: string, logger: Logger,
|
|
12
|
-
|
|
13
|
-
sourceKey: string;
|
|
14
|
-
}): Promise<Map<string, ArtifactRef[]>>;
|
|
15
|
-
export declare function findConflictGroups(index: Map<string, ArtifactRef[]>, logger: Logger, logMeta: {
|
|
16
|
-
siteId: string;
|
|
17
|
-
sourceKey: string;
|
|
18
|
-
}): ConflictGroup[];
|
|
11
|
+
export declare function indexEntitiesDir(entitiesRootAbs: string, logger: Logger): Promise<Map<string, ArtifactRef[]>>;
|
|
12
|
+
export declare function findConflictGroups(index: Map<string, ArtifactRef[]>, logger: Logger): ConflictGroup[];
|
|
19
13
|
//# sourceMappingURL=detect.d.ts.map
|
package/dist/detect.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE7D,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAkD7D;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE7D,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAkD7D;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAqCrC;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,GACb,aAAa,EAAE,CAmBjB"}
|
package/dist/detect.js
CHANGED
|
@@ -47,7 +47,7 @@ function parseArtifactFilename(filename) {
|
|
|
47
47
|
* Same entity = same entityType + same base name (e.g. button.react.mdx or button.react.md);
|
|
48
48
|
* sourceType and hash are read from the filename.
|
|
49
49
|
*/
|
|
50
|
-
export async function indexEntitiesDir(entitiesRootAbs, logger
|
|
50
|
+
export async function indexEntitiesDir(entitiesRootAbs, logger) {
|
|
51
51
|
const index = new Map();
|
|
52
52
|
const entityTypeDirs = await fs.readdir(entitiesRootAbs, {
|
|
53
53
|
withFileTypes: true,
|
|
@@ -80,18 +80,12 @@ export async function indexEntitiesDir(entitiesRootAbs, logger, logMeta) {
|
|
|
80
80
|
index.set(key, [ref]);
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
logger.info('
|
|
84
|
-
|
|
85
|
-
metadata: { sourceKey: logMeta.sourceKey },
|
|
86
|
-
evt: {
|
|
87
|
-
name: 'sourceConflicts.index',
|
|
88
|
-
outcome: 'success',
|
|
89
|
-
entityCount: index.size,
|
|
90
|
-
},
|
|
83
|
+
logger.info('Indexed entities', {
|
|
84
|
+
metadata: { eventName: 'source-conflicts.index', entityKeys: index.size },
|
|
91
85
|
});
|
|
92
86
|
return index;
|
|
93
87
|
}
|
|
94
|
-
export function findConflictGroups(index, logger
|
|
88
|
+
export function findConflictGroups(index, logger) {
|
|
95
89
|
const conflicts = [];
|
|
96
90
|
for (const [key, artifacts] of index.entries()) {
|
|
97
91
|
if (artifacts.length < 2)
|
|
@@ -101,14 +95,10 @@ export function findConflictGroups(index, logger, logMeta) {
|
|
|
101
95
|
conflicts.push({ key, entityKind, relPath, artifacts });
|
|
102
96
|
}
|
|
103
97
|
conflicts.sort((a, b) => a.key.localeCompare(b.key)); // stable order for deterministic output
|
|
104
|
-
logger.info('
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
name: 'sourceConflicts.findGroups',
|
|
109
|
-
step: 'complete',
|
|
110
|
-
outcome: 'success',
|
|
111
|
-
itemCount: conflicts.length,
|
|
98
|
+
logger.info('Conflict groups', {
|
|
99
|
+
metadata: {
|
|
100
|
+
eventName: 'source-conflicts.conflictGroups',
|
|
101
|
+
count: conflicts.length,
|
|
112
102
|
},
|
|
113
103
|
});
|
|
114
104
|
return conflicts;
|
package/dist/detect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAK9D,KAAK,UAAU,SAAS,CAAC,GAAW;IAClC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;YACtB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAWD;;;GAGG;AACH,SAAS,qBAAqB,CAC5B,QAAgB;IAEhB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;IACxB,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;IACnC,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1E,0FAA0F;IAC1F,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,eAAuB,EACvB,MAAc
|
|
1
|
+
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"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"}
|
package/dist/detect.vitest.js
CHANGED
|
@@ -9,11 +9,6 @@ const mockLogger = {
|
|
|
9
9
|
debug: () => { },
|
|
10
10
|
error: () => { },
|
|
11
11
|
};
|
|
12
|
-
const mockLogCtx = {
|
|
13
|
-
sourceType: 'STORYBOOK',
|
|
14
|
-
sourceKey: 'test',
|
|
15
|
-
siteId: 'test-site',
|
|
16
|
-
};
|
|
17
12
|
function ref(overrides) {
|
|
18
13
|
const { sourceType, relPath, entityKind, absPath, sourceTag, ...rest } = overrides;
|
|
19
14
|
return {
|
|
@@ -31,7 +26,7 @@ describe('findConflictGroups', () => {
|
|
|
31
26
|
index.set('COMPONENT::button.react.mdx', [
|
|
32
27
|
ref({ sourceType: 'STORYBOOK', relPath: 'button.react.mdx' }),
|
|
33
28
|
]);
|
|
34
|
-
expect(findConflictGroups(index, mockLogger
|
|
29
|
+
expect(findConflictGroups(index, mockLogger)).toEqual([]);
|
|
35
30
|
});
|
|
36
31
|
it('returns one conflict group when two sources share same entity', () => {
|
|
37
32
|
const index = new Map();
|
|
@@ -40,7 +35,7 @@ describe('findConflictGroups', () => {
|
|
|
40
35
|
ref({ sourceType: 'STORYBOOK', relPath: 'button.react.mdx' }),
|
|
41
36
|
ref({ sourceType: 'KNAPSACK', relPath: 'button.react.mdx' }),
|
|
42
37
|
]);
|
|
43
|
-
const groups = findConflictGroups(index, mockLogger
|
|
38
|
+
const groups = findConflictGroups(index, mockLogger);
|
|
44
39
|
expect(groups).toHaveLength(1);
|
|
45
40
|
expect(groups[0].key).toBe(key);
|
|
46
41
|
expect(groups[0].entityKind).toBe('COMPONENT');
|
|
@@ -57,7 +52,7 @@ describe('findConflictGroups', () => {
|
|
|
57
52
|
ref({ sourceType: 'FIGMA', relPath: 'button.react.mdx' }),
|
|
58
53
|
ref({ sourceType: 'KNAPSACK', relPath: 'button.react.mdx' }),
|
|
59
54
|
]);
|
|
60
|
-
const groups = findConflictGroups(index, mockLogger
|
|
55
|
+
const groups = findConflictGroups(index, mockLogger);
|
|
61
56
|
expect(groups).toHaveLength(2);
|
|
62
57
|
expect(groups[0].key).toBe('COMPONENT::button.react.mdx');
|
|
63
58
|
expect(groups[1].key).toBe('COMPONENT::card.react.mdx');
|
|
@@ -71,7 +66,7 @@ describe('findConflictGroups', () => {
|
|
|
71
66
|
ref({ sourceType: 'STORYBOOK', relPath: 'button.react.mdx' }),
|
|
72
67
|
ref({ sourceType: 'KNAPSACK', relPath: 'button.react.mdx' }),
|
|
73
68
|
]);
|
|
74
|
-
const groups = findConflictGroups(index, mockLogger
|
|
69
|
+
const groups = findConflictGroups(index, mockLogger);
|
|
75
70
|
expect(groups).toHaveLength(1);
|
|
76
71
|
expect(groups[0].relPath).toBe('button.react.mdx');
|
|
77
72
|
});
|
|
@@ -86,7 +81,7 @@ describe('indexEntitiesDir', () => {
|
|
|
86
81
|
const f2 = path.join(componentDir, 'button.react.knapsack-def456.mdx');
|
|
87
82
|
await fs.writeFile(f1, '');
|
|
88
83
|
await fs.writeFile(f2, '');
|
|
89
|
-
const index = await indexEntitiesDir(tmp, mockLogger
|
|
84
|
+
const index = await indexEntitiesDir(tmp, mockLogger);
|
|
90
85
|
expect(index.size).toBe(1);
|
|
91
86
|
const key = 'COMPONENT::button.react.mdx';
|
|
92
87
|
const artifacts = index.get(key);
|
|
@@ -110,7 +105,7 @@ describe('indexEntitiesDir', () => {
|
|
|
110
105
|
await fs.writeFile(path.join(componentDir, 'bad.suffix-xyz.mdx'), '');
|
|
111
106
|
await fs.mkdir(path.join(tmp, 'other'), { recursive: true });
|
|
112
107
|
await fs.writeFile(path.join(tmp, 'other', 'file.storybook-h.mdx'), '');
|
|
113
|
-
const index = await indexEntitiesDir(tmp, mockLogger
|
|
108
|
+
const index = await indexEntitiesDir(tmp, mockLogger);
|
|
114
109
|
expect(index.size).toBe(1);
|
|
115
110
|
expect(index.has('COMPONENT::button.react.mdx')).toBe(true);
|
|
116
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.vitest.js","sourceRoot":"","sources":["../src/detect.vitest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,UAAU,GAAW;IACzB,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;CAChB,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"detect.vitest.js","sourceRoot":"","sources":["../src/detect.vitest.ts"],"names":[],"mappings":"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"}
|
package/dist/parser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAIxD,wBAAsB,KAAK,CACzB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAIxD,wBAAsB,KAAK,CACzB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,CA+Df"}
|
package/dist/parser.js
CHANGED
|
@@ -4,21 +4,18 @@ import { resolveSourceKey } from './types.js';
|
|
|
4
4
|
import { indexEntitiesDir, findConflictGroups } from './detect.js';
|
|
5
5
|
export async function parse(config, deps) {
|
|
6
6
|
const siteId = config.siteId ?? 'unknown';
|
|
7
|
-
const sourceKey = resolveSourceKey(config);
|
|
8
7
|
const start = Date.now();
|
|
9
|
-
const logMeta = { siteId, sourceKey };
|
|
10
8
|
deps.logger.info('Source conflicts parse started', {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
outcome: null,
|
|
9
|
+
metadata: {
|
|
10
|
+
eventName: 'source-conflicts.index',
|
|
11
|
+
sourceKey: resolveSourceKey(config),
|
|
12
|
+
siteId,
|
|
13
|
+
entitiesRootAbs: config.entitiesRootAbs,
|
|
17
14
|
},
|
|
18
15
|
});
|
|
19
|
-
const index = await indexEntitiesDir(config.entitiesRootAbs, deps.logger
|
|
20
|
-
const conflictGroups = findConflictGroups(index, deps.logger
|
|
21
|
-
const rawDir = join(deps.outputPath, 'raw',
|
|
16
|
+
const index = await indexEntitiesDir(config.entitiesRootAbs, deps.logger);
|
|
17
|
+
const conflictGroups = findConflictGroups(index, deps.logger);
|
|
18
|
+
const rawDir = join(deps.outputPath, 'raw', resolveSourceKey(config));
|
|
22
19
|
// Write each conflict group as a raw extraction
|
|
23
20
|
for (const group of conflictGroups) {
|
|
24
21
|
deps.writeFile({
|
|
@@ -27,10 +24,9 @@ export async function parse(config, deps) {
|
|
|
27
24
|
});
|
|
28
25
|
deps.emit({ stage: 'parse', type: 'item.ok', ref: group.key });
|
|
29
26
|
}
|
|
30
|
-
const durationMs = Date.now() - start;
|
|
31
27
|
const manifest = {
|
|
32
28
|
siteId,
|
|
33
|
-
sourceKey,
|
|
29
|
+
sourceKey: resolveSourceKey(config),
|
|
34
30
|
sourceType: 'SOURCE_CONFLICTS',
|
|
35
31
|
manifestVersion: '1',
|
|
36
32
|
items: conflictGroups.map((g) => ({
|
|
@@ -44,7 +40,7 @@ export async function parse(config, deps) {
|
|
|
44
40
|
discoveredItemCount: index.size,
|
|
45
41
|
itemCount: conflictGroups.length,
|
|
46
42
|
errors: 0,
|
|
47
|
-
durationMs,
|
|
43
|
+
durationMs: Date.now() - start,
|
|
48
44
|
startedAt: new Date(start).toISOString(),
|
|
49
45
|
completedAt: new Date().toISOString(),
|
|
50
46
|
},
|
|
@@ -55,14 +51,12 @@ export async function parse(config, deps) {
|
|
|
55
51
|
content: stringifyYaml(manifest),
|
|
56
52
|
});
|
|
57
53
|
deps.logger.info('Source conflicts parse complete', {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
itemCount: conflictGroups.length,
|
|
65
|
-
durationMs,
|
|
54
|
+
metadata: {
|
|
55
|
+
eventName: 'source-conflicts.conflictGroups',
|
|
56
|
+
sourceKey: resolveSourceKey(config),
|
|
57
|
+
siteId,
|
|
58
|
+
conflictGroups: conflictGroups.length,
|
|
59
|
+
totalEntities: index.size,
|
|
66
60
|
},
|
|
67
61
|
});
|
|
68
62
|
}
|
package/dist/parser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAGlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,MAA6B,EAC7B,IAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;IAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAGlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,MAA6B,EAC7B,IAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE;QACjD,QAAQ,EAAE;YACR,SAAS,EAAE,wBAAwB;YACnC,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;YACnC,MAAM;YACN,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtE,gDAAgD;IAChD,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC;YACvC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SAC/B,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,QAAQ,GAAa;QACzB,MAAM;QACN,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;QACnC,UAAU,EAAE,kBAAkB;QAC9B,eAAe,EAAE,GAAG;QACpB,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE;YACnC,KAAK,EAAE,OAAO;SACf,CAAC,CAAC;QACH,MAAM,EAAE;YACN,KAAK,EAAE;gBACL,MAAM,EAAE,SAAS;gBACjB,mBAAmB,EAAE,KAAK,CAAC,IAAI;gBAC/B,SAAS,EAAE,cAAc,CAAC,MAAM;gBAChC,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;gBAC9B,SAAS,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE;gBACxC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACtC;SACF;KACF,CAAC;IAEF,IAAI,CAAC,SAAS,CAAC;QACb,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC;QAClC,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC;KACjC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE;QAClD,QAAQ,EAAE;YACR,SAAS,EAAE,iCAAiC;YAC5C,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC;YACnC,MAAM;YACN,cAAc,EAAE,cAAc,CAAC,MAAM;YACrC,aAAa,EAAE,KAAK,CAAC,IAAI;SAC1B;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMxD,wBAAsB,SAAS,CAC7B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAMxD,wBAAsB,SAAS,CAC7B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,IAAI,CAAC,CAyHf"}
|
package/dist/transformer.js
CHANGED
|
@@ -6,19 +6,16 @@ import { detectMdxConflictBundle } from './mdx/mdxConflicts.js';
|
|
|
6
6
|
import { detectJsonConflictBundle } from './json/jsonConflicts.js';
|
|
7
7
|
export async function transform(config, deps) {
|
|
8
8
|
const siteId = config.siteId ?? 'unknown';
|
|
9
|
-
const sourceKey = resolveSourceKey(config);
|
|
10
9
|
const start = Date.now();
|
|
11
10
|
deps.logger.info('Source conflicts transform started', {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
step: 'start',
|
|
17
|
-
outcome: null,
|
|
11
|
+
metadata: {
|
|
12
|
+
eventName: 'source-conflicts.detectBundle',
|
|
13
|
+
sourceKey: resolveSourceKey(config),
|
|
14
|
+
siteId,
|
|
18
15
|
},
|
|
19
16
|
});
|
|
20
|
-
const rawDir = join(deps.outputPath, 'raw',
|
|
21
|
-
const sourcesDir = join(deps.outputPath, 'sources',
|
|
17
|
+
const rawDir = join(deps.outputPath, 'raw', resolveSourceKey(config));
|
|
18
|
+
const sourcesDir = join(deps.outputPath, 'sources', resolveSourceKey(config));
|
|
22
19
|
const manifest = parseYaml(readFileSync(join(rawDir, 'manifest.yml'), 'utf-8'));
|
|
23
20
|
let errors = 0;
|
|
24
21
|
let itemCount = 0;
|
|
@@ -66,17 +63,15 @@ export async function transform(config, deps) {
|
|
|
66
63
|
itemCount += 1;
|
|
67
64
|
}
|
|
68
65
|
catch (err) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
metadata: {
|
|
72
|
-
|
|
73
|
-
name: 'sourceConflicts.item',
|
|
66
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
67
|
+
deps.logger.warn('Source conflicts transform item failed', {
|
|
68
|
+
metadata: {
|
|
69
|
+
eventName: 'source-conflicts.detectBundle',
|
|
74
70
|
ref: item.ref,
|
|
75
|
-
|
|
71
|
+
sourceKey: resolveSourceKey(config),
|
|
72
|
+
error: message,
|
|
76
73
|
},
|
|
77
|
-
...(err instanceof Error && { error: err }),
|
|
78
74
|
});
|
|
79
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
80
75
|
deps.emit({
|
|
81
76
|
stage: 'transform',
|
|
82
77
|
type: 'item.error',
|
|
@@ -86,7 +81,6 @@ export async function transform(config, deps) {
|
|
|
86
81
|
errors += 1;
|
|
87
82
|
}
|
|
88
83
|
}
|
|
89
|
-
const durationMs = Date.now() - start;
|
|
90
84
|
const updated = {
|
|
91
85
|
...manifest,
|
|
92
86
|
stages: {
|
|
@@ -95,7 +89,7 @@ export async function transform(config, deps) {
|
|
|
95
89
|
status: errors > 0 ? 'failure' : 'success',
|
|
96
90
|
itemCount,
|
|
97
91
|
errors,
|
|
98
|
-
durationMs,
|
|
92
|
+
durationMs: Date.now() - start,
|
|
99
93
|
startedAt: new Date(start).toISOString(),
|
|
100
94
|
completedAt: new Date().toISOString(),
|
|
101
95
|
},
|
|
@@ -106,14 +100,12 @@ export async function transform(config, deps) {
|
|
|
106
100
|
content: stringifyYaml(updated),
|
|
107
101
|
});
|
|
108
102
|
deps.logger.info('Source conflicts transform complete', {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
step: 'complete',
|
|
114
|
-
outcome: errors > 0 ? 'failure' : 'success',
|
|
103
|
+
metadata: {
|
|
104
|
+
eventName: 'source-conflicts.detectBundle',
|
|
105
|
+
sourceKey: resolveSourceKey(config),
|
|
106
|
+
siteId,
|
|
115
107
|
itemCount,
|
|
116
|
-
|
|
108
|
+
errors,
|
|
117
109
|
},
|
|
118
110
|
});
|
|
119
111
|
}
|
package/dist/transformer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,MAA6B,EAC7B,IAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;IAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@knapsack/source-conflicts-adapter",
|
|
3
3
|
"description": "Source conflicts ContextSrcAdapter — detect and compare entity conflicts across sources.",
|
|
4
|
-
"version": "4.92.2--canary.
|
|
4
|
+
"version": "4.92.2--canary.7408.16ee1b4.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
},
|
|
24
24
|
"author": "Knapsack (https://www.knapsack.cloud)",
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@knapsack/adapter-core": "4.92.2--canary.
|
|
27
|
-
"@knapsack/utils": "4.92.2--canary.
|
|
26
|
+
"@knapsack/adapter-core": "4.92.2--canary.7408.16ee1b4.0",
|
|
27
|
+
"@knapsack/utils": "4.92.2--canary.7408.16ee1b4.0",
|
|
28
28
|
"diff": "^8.0.3",
|
|
29
29
|
"fast-json-stable-stringify": "^2.1.0",
|
|
30
30
|
"gray-matter": "^4.0.3",
|
|
@@ -40,8 +40,8 @@
|
|
|
40
40
|
"yaml": "^2.7.0"
|
|
41
41
|
},
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@knapsack/eslint-config-starter": "4.92.2--canary.
|
|
44
|
-
"@knapsack/typescript-config-starter": "4.92.2--canary.
|
|
43
|
+
"@knapsack/eslint-config-starter": "4.92.2--canary.7408.16ee1b4.0",
|
|
44
|
+
"@knapsack/typescript-config-starter": "4.92.2--canary.7408.16ee1b4.0",
|
|
45
45
|
"@types/node": "^22.19.11",
|
|
46
46
|
"@types/prettier": "^2.7.3",
|
|
47
47
|
"eslint": "^9.20.0",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"directory": "libs/ingest-pipeline/adapters/source-conflicts",
|
|
58
58
|
"type": "git"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "16ee1b42182c82f56e4af51b4c7c6818f2440836"
|
|
61
61
|
}
|