@jterrats/smart-deployment 1.2.5 → 1.3.1
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/README.md +31 -1
- package/lib/analysis/project-analysis-service.d.ts +5 -0
- package/lib/analysis/project-analysis-service.js +18 -0
- package/lib/analysis/project-analysis-service.js.map +1 -1
- package/lib/commands/ci/preset.d.ts +25 -0
- package/lib/commands/ci/preset.js +125 -0
- package/lib/commands/ci/preset.js.map +1 -0
- package/lib/commands/graph/export.d.ts +20 -0
- package/lib/commands/graph/export.js +107 -0
- package/lib/commands/graph/export.js.map +1 -0
- package/lib/commands/impact.d.ts +18 -0
- package/lib/commands/impact.js +105 -0
- package/lib/commands/impact.js.map +1 -0
- package/lib/commands/init.d.ts +19 -0
- package/lib/commands/init.js +83 -0
- package/lib/commands/init.js.map +1 -0
- package/lib/commands/plan/explain.d.ts +14 -0
- package/lib/commands/plan/explain.js +134 -0
- package/lib/commands/plan/explain.js.map +1 -0
- package/lib/commands/resume.d.ts +1 -0
- package/lib/commands/resume.js +17 -3
- package/lib/commands/resume.js.map +1 -1
- package/lib/commands/retrieve.d.ts +20 -0
- package/lib/commands/retrieve.js +111 -0
- package/lib/commands/retrieve.js.map +1 -0
- package/lib/commands/start.d.ts +21 -0
- package/lib/commands/start.js +124 -14
- package/lib/commands/start.js.map +1 -1
- package/lib/commands/status.d.ts +1 -0
- package/lib/commands/status.js +15 -3
- package/lib/commands/status.js.map +1 -1
- package/lib/commands/validate.d.ts +8 -0
- package/lib/commands/validate.js +14 -0
- package/lib/commands/validate.js.map +1 -1
- package/lib/config/init-config-generation-service.d.ts +27 -0
- package/lib/config/init-config-generation-service.js +88 -0
- package/lib/config/init-config-generation-service.js.map +1 -0
- package/lib/config/repo-config.d.ts +25 -0
- package/lib/config/repo-config.js.map +1 -1
- package/lib/dependencies/dependency-graph-builder.d.ts +1 -0
- package/lib/dependencies/dependency-graph-builder.js +15 -0
- package/lib/dependencies/dependency-graph-builder.js.map +1 -1
- package/lib/dependencies/impact-analysis-service.d.ts +77 -0
- package/lib/dependencies/impact-analysis-service.js +234 -0
- package/lib/dependencies/impact-analysis-service.js.map +1 -0
- package/lib/deployment/ci-preset-service.d.ts +44 -0
- package/lib/deployment/ci-preset-service.js +65 -0
- package/lib/deployment/ci-preset-service.js.map +1 -0
- package/lib/deployment/commit-scope-service.d.ts +43 -0
- package/lib/deployment/commit-scope-service.js +209 -0
- package/lib/deployment/commit-scope-service.js.map +1 -0
- package/lib/deployment/deployment-context-service.d.ts +3 -0
- package/lib/deployment/deployment-context-service.js +1 -0
- package/lib/deployment/deployment-context-service.js.map +1 -1
- package/lib/deployment/deployment-error-diagnostics.d.ts +11 -0
- package/lib/deployment/deployment-error-diagnostics.js +187 -0
- package/lib/deployment/deployment-error-diagnostics.js.map +1 -0
- package/lib/deployment/deployment-runner.d.ts +1 -0
- package/lib/deployment/deployment-runner.js +35 -15
- package/lib/deployment/deployment-runner.js.map +1 -1
- package/lib/deployment/deployment-status-service.d.ts +9 -2
- package/lib/deployment/deployment-status-service.js +56 -3
- package/lib/deployment/deployment-status-service.js.map +1 -1
- package/lib/deployment/deployment-validation-service.d.ts +3 -0
- package/lib/deployment/deployment-validation-service.js +32 -4
- package/lib/deployment/deployment-validation-service.js.map +1 -1
- package/lib/deployment/plan-explain-service.d.ts +88 -0
- package/lib/deployment/plan-explain-service.js +171 -0
- package/lib/deployment/plan-explain-service.js.map +1 -0
- package/lib/deployment/resume-deployment-service.d.ts +6 -2
- package/lib/deployment/resume-deployment-service.js +27 -3
- package/lib/deployment/resume-deployment-service.js.map +1 -1
- package/lib/deployment/retrieve-forceignore-service.d.ts +51 -0
- package/lib/deployment/retrieve-forceignore-service.js +139 -0
- package/lib/deployment/retrieve-forceignore-service.js.map +1 -0
- package/lib/deployment/rollback-planning-service.d.ts +49 -0
- package/lib/deployment/rollback-planning-service.js +178 -0
- package/lib/deployment/rollback-planning-service.js.map +1 -0
- package/lib/deployment/sf-cli-integration.d.ts +4 -0
- package/lib/deployment/sf-cli-integration.js +22 -2
- package/lib/deployment/sf-cli-integration.js.map +1 -1
- package/lib/deployment/start-execution-service.d.ts +1 -0
- package/lib/deployment/start-execution-service.js +14 -8
- package/lib/deployment/start-execution-service.js.map +1 -1
- package/lib/deployment/wave-manifest-service.d.ts +8 -0
- package/lib/deployment/wave-manifest-service.js +39 -20
- package/lib/deployment/wave-manifest-service.js.map +1 -1
- package/lib/presentation/plan-explain-presenter.d.ts +9 -0
- package/lib/presentation/plan-explain-presenter.js +40 -0
- package/lib/presentation/plan-explain-presenter.js.map +1 -0
- package/lib/presentation/start-command-presenter.d.ts +4 -0
- package/lib/presentation/start-command-presenter.js +4 -0
- package/lib/presentation/start-command-presenter.js.map +1 -1
- package/lib/reports/deployment-plan-report-service.d.ts +76 -0
- package/lib/reports/deployment-plan-report-service.js +234 -0
- package/lib/reports/deployment-plan-report-service.js.map +1 -0
- package/lib/reports/graph-export-service.d.ts +85 -0
- package/lib/reports/graph-export-service.js +296 -0
- package/lib/reports/graph-export-service.js.map +1 -0
- package/lib/services/metadata-scanner-service.js +4 -2
- package/lib/services/metadata-scanner-service.js.map +1 -1
- package/lib/services/scanners/automation-ai-metadata-scanner.d.ts +1 -0
- package/lib/services/scanners/automation-ai-metadata-scanner.js +39 -0
- package/lib/services/scanners/automation-ai-metadata-scanner.js.map +1 -1
- package/lib/utils/deployment-plan-manager.js +3 -2
- package/lib/utils/deployment-plan-manager.js.map +1 -1
- package/messages/ci.preset.json +22 -0
- package/messages/graph.export.json +20 -0
- package/messages/impact.json +18 -0
- package/messages/init.json +16 -0
- package/messages/plan.explain.json +20 -0
- package/messages/resume.json +1 -0
- package/messages/retrieve.json +26 -0
- package/messages/start.json +16 -2
- package/messages/status.json +1 -0
- package/messages/validate.json +3 -1
- package/npm-shrinkwrap.json +45 -70
- package/oclif.lock +44 -41
- package/oclif.manifest.json +801 -25
- package/package.json +9 -8
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { readFile, rm, writeFile } from 'node:fs/promises';
|
|
3
|
+
import * as path from 'node:path';
|
|
4
|
+
import { promisify } from 'node:util';
|
|
5
|
+
import { glob } from 'glob';
|
|
6
|
+
import { ForceIgnoreParser } from '../scanner/forceignore-parser.js';
|
|
7
|
+
const execFileAsync = promisify(execFile);
|
|
8
|
+
export class RetrieveForceIgnoreService {
|
|
9
|
+
sfRetrieveRunner;
|
|
10
|
+
gitProvider;
|
|
11
|
+
constructor(dependencies = {}) {
|
|
12
|
+
this.sfRetrieveRunner = dependencies.sfRetrieveRunner ?? new SfRetrieveRunner();
|
|
13
|
+
this.gitProvider = dependencies.gitProvider ?? new GitWorkspaceProvider();
|
|
14
|
+
}
|
|
15
|
+
async retrieve(options = {}) {
|
|
16
|
+
const projectRoot = path.resolve(options.projectRoot ?? process.cwd());
|
|
17
|
+
const retrieveOutput = await this.sfRetrieveRunner.retrieve(projectRoot, options);
|
|
18
|
+
const normalizedPaths = options.normalizeMeta === true ? await normalizeDigitalExperienceMeta(projectRoot) : [];
|
|
19
|
+
const parser = new ForceIgnoreParser();
|
|
20
|
+
const loadResult = await parser.load(projectRoot);
|
|
21
|
+
const changedEntries = await this.gitProvider.listChangedPaths(projectRoot);
|
|
22
|
+
const changedPaths = changedEntries.map((entry) => entry.path).sort();
|
|
23
|
+
const protectedEntries = loadResult.found
|
|
24
|
+
? changedEntries.filter((entry) => parser.isIgnored(path.join(projectRoot, entry.path)))
|
|
25
|
+
: [];
|
|
26
|
+
const protectedPaths = protectedEntries.map((entry) => entry.path).sort();
|
|
27
|
+
const restoredPaths = protectedPaths.length > 0 ? await this.gitProvider.restorePaths(projectRoot, protectedEntries) : [];
|
|
28
|
+
const strictViolation = options.strictIgnore === true && protectedPaths.length > 0;
|
|
29
|
+
return {
|
|
30
|
+
success: !strictViolation,
|
|
31
|
+
projectRoot,
|
|
32
|
+
retrieveOutput,
|
|
33
|
+
changedPaths,
|
|
34
|
+
protectedPaths,
|
|
35
|
+
restoredPaths,
|
|
36
|
+
normalizedPaths,
|
|
37
|
+
strictViolation,
|
|
38
|
+
architecturalConcerns: {
|
|
39
|
+
inherited: [
|
|
40
|
+
'Salesforce CLI may retrieve composite bundle sub-paths even when .forceignore excludes leaf paths.',
|
|
41
|
+
],
|
|
42
|
+
selfImposed: [
|
|
43
|
+
'Adds a retrieve wrapper that enforces .forceignore after the Salesforce CLI writes files because the underlying CLI does not expose reliable leaf-level bundle filtering.',
|
|
44
|
+
],
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
export class SfRetrieveRunner {
|
|
50
|
+
async retrieve(projectRoot, options) {
|
|
51
|
+
const args = ['project', 'retrieve', 'start', '--json'];
|
|
52
|
+
for (const metadata of options.metadata ?? []) {
|
|
53
|
+
args.push('--metadata', metadata);
|
|
54
|
+
}
|
|
55
|
+
if (options.manifest) {
|
|
56
|
+
args.push('--manifest', options.manifest);
|
|
57
|
+
}
|
|
58
|
+
if (options.targetOrg) {
|
|
59
|
+
args.push('--target-org', options.targetOrg);
|
|
60
|
+
}
|
|
61
|
+
if (options.wait !== undefined) {
|
|
62
|
+
args.push('--wait', String(options.wait));
|
|
63
|
+
}
|
|
64
|
+
const { stdout, stderr } = await execFileAsync('sf', args, { cwd: projectRoot });
|
|
65
|
+
return stdout + stderr;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
export class GitWorkspaceProvider {
|
|
69
|
+
async listChangedPaths(projectRoot) {
|
|
70
|
+
const { stdout } = await execFileAsync('git', ['status', '--porcelain', '--untracked-files=all'], {
|
|
71
|
+
cwd: projectRoot,
|
|
72
|
+
});
|
|
73
|
+
return parseGitStatus(stdout);
|
|
74
|
+
}
|
|
75
|
+
async restorePaths(projectRoot, entries) {
|
|
76
|
+
const restored = await entries.reduce(async (previous, entry) => {
|
|
77
|
+
const restoredPaths = await previous;
|
|
78
|
+
await restoreGitStatusEntry(projectRoot, entry);
|
|
79
|
+
return [...restoredPaths, entry.path];
|
|
80
|
+
}, Promise.resolve([]));
|
|
81
|
+
return restored.sort();
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
async function restoreGitStatusEntry(projectRoot, entry) {
|
|
85
|
+
const absolutePath = path.join(projectRoot, entry.path);
|
|
86
|
+
if (entry.untracked) {
|
|
87
|
+
await rm(absolutePath, { recursive: true, force: true });
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
await execFileAsync('git', ['checkout', 'HEAD', '--', entry.path], { cwd: projectRoot });
|
|
91
|
+
}
|
|
92
|
+
function parseGitStatus(output) {
|
|
93
|
+
return output
|
|
94
|
+
.split('\n')
|
|
95
|
+
.filter(Boolean)
|
|
96
|
+
.map((line) => {
|
|
97
|
+
const indexStatus = line[0] ?? ' ';
|
|
98
|
+
const workingTreeStatus = line[1] ?? ' ';
|
|
99
|
+
const rawPath = line.slice(3);
|
|
100
|
+
const filePath = rawPath.includes(' -> ') ? rawPath.split(' -> ').at(-1) : rawPath;
|
|
101
|
+
return {
|
|
102
|
+
path: normalizeGitPath(filePath),
|
|
103
|
+
indexStatus,
|
|
104
|
+
workingTreeStatus,
|
|
105
|
+
untracked: indexStatus === '?' && workingTreeStatus === '?',
|
|
106
|
+
};
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
async function normalizeDigitalExperienceMeta(projectRoot) {
|
|
110
|
+
const files = await glob('**/digitalExperiences/**/*_meta.json', {
|
|
111
|
+
cwd: projectRoot,
|
|
112
|
+
absolute: true,
|
|
113
|
+
nodir: true,
|
|
114
|
+
dot: true,
|
|
115
|
+
ignore: ['**/node_modules/**', '**/.git/**'],
|
|
116
|
+
});
|
|
117
|
+
const normalizedPaths = await Promise.all(files.map(async (file) => {
|
|
118
|
+
const raw = await readFile(file, 'utf8');
|
|
119
|
+
const normalized = JSON.stringify(JSON.parse(raw), null, 2) + '\n';
|
|
120
|
+
if (raw === normalized) {
|
|
121
|
+
return undefined;
|
|
122
|
+
}
|
|
123
|
+
await writeFile(file, normalized, 'utf8');
|
|
124
|
+
return normalizeRelativePath(projectRoot, file);
|
|
125
|
+
}));
|
|
126
|
+
return normalizedPaths.filter((filePath) => filePath !== undefined).sort();
|
|
127
|
+
}
|
|
128
|
+
function normalizeGitPath(filePath) {
|
|
129
|
+
const unquoted = filePath.startsWith('"') && filePath.endsWith('"') ? JSON.parse(filePath) : filePath;
|
|
130
|
+
return unquoted.split(path.sep).join('/');
|
|
131
|
+
}
|
|
132
|
+
function normalizeRelativePath(projectRoot, filePath) {
|
|
133
|
+
const relativePath = path.relative(projectRoot, filePath);
|
|
134
|
+
return relativePath.split(path.sep).join('/');
|
|
135
|
+
}
|
|
136
|
+
export const retrieveForceIgnoreInternals = {
|
|
137
|
+
parseGitStatus,
|
|
138
|
+
};
|
|
139
|
+
//# sourceMappingURL=retrieve-forceignore-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retrieve-forceignore-service.js","sourceRoot":"","sources":["../../src/deployment/retrieve-forceignore-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { NodeId } from '../types/dependency.js';
|
|
2
|
+
import type { DeploymentContext } from './deployment-context-service.js';
|
|
3
|
+
export type RollbackChangeStatus = 'added' | 'modified' | 'deleted';
|
|
4
|
+
export type RollbackGitChange = {
|
|
5
|
+
status: RollbackChangeStatus;
|
|
6
|
+
path: string;
|
|
7
|
+
};
|
|
8
|
+
export type RollbackSummary = {
|
|
9
|
+
from: string;
|
|
10
|
+
to: string;
|
|
11
|
+
changes: RollbackGitChange[];
|
|
12
|
+
destructiveComponents: NodeId[];
|
|
13
|
+
restoreComponents: NodeId[];
|
|
14
|
+
};
|
|
15
|
+
export type RollbackExecutionPlan = {
|
|
16
|
+
summary: RollbackSummary;
|
|
17
|
+
destructiveContext?: DeploymentContext;
|
|
18
|
+
restoreContext?: DeploymentContext;
|
|
19
|
+
cleanup: () => Promise<void>;
|
|
20
|
+
};
|
|
21
|
+
type RollbackPlanningServiceDependencies = {
|
|
22
|
+
gitProvider?: RollbackGitProvider;
|
|
23
|
+
};
|
|
24
|
+
type BuildContext = (sourcePath: string) => Promise<DeploymentContext>;
|
|
25
|
+
export type RollbackGitProvider = {
|
|
26
|
+
listChanges(projectRoot: string, fromRef: string, toRef: string): Promise<RollbackGitChange[]>;
|
|
27
|
+
checkoutArchive(projectRoot: string, ref: string): Promise<RollbackWorkspace>;
|
|
28
|
+
};
|
|
29
|
+
export type RollbackWorkspace = {
|
|
30
|
+
projectRoot: string;
|
|
31
|
+
cleanup: () => Promise<void>;
|
|
32
|
+
};
|
|
33
|
+
export declare class RollbackPlanningService {
|
|
34
|
+
private readonly gitProvider;
|
|
35
|
+
constructor(dependencies?: RollbackPlanningServiceDependencies);
|
|
36
|
+
buildExecutionPlan(options: {
|
|
37
|
+
projectRoot: string;
|
|
38
|
+
fromRef: string;
|
|
39
|
+
toRef: string;
|
|
40
|
+
currentContext: DeploymentContext;
|
|
41
|
+
buildContext: BuildContext;
|
|
42
|
+
}): Promise<RollbackExecutionPlan>;
|
|
43
|
+
filterContextByChanges(context: DeploymentContext, changes: RollbackGitChange[]): DeploymentContext;
|
|
44
|
+
}
|
|
45
|
+
declare function parseNameStatus(output: string): RollbackGitChange[];
|
|
46
|
+
export declare const rollbackPlanningInternals: {
|
|
47
|
+
parseNameStatus: typeof parseNameStatus;
|
|
48
|
+
};
|
|
49
|
+
export {};
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
|
+
import { mkdtemp, rm } from 'node:fs/promises';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import * as path from 'node:path';
|
|
5
|
+
import { promisify } from 'node:util';
|
|
6
|
+
import { DependencyGraphBuilder } from '../dependencies/dependency-graph-builder.js';
|
|
7
|
+
const execFileAsync = promisify(execFile);
|
|
8
|
+
export class RollbackPlanningService {
|
|
9
|
+
gitProvider;
|
|
10
|
+
constructor(dependencies = {}) {
|
|
11
|
+
this.gitProvider = dependencies.gitProvider ?? new CliRollbackGitProvider();
|
|
12
|
+
}
|
|
13
|
+
async buildExecutionPlan(options) {
|
|
14
|
+
const changes = await this.gitProvider.listChanges(options.projectRoot, options.fromRef, options.toRef);
|
|
15
|
+
const destructiveChanges = changes.filter((change) => change.status === 'added');
|
|
16
|
+
const restoreChanges = changes.filter((change) => change.status === 'modified' || change.status === 'deleted');
|
|
17
|
+
const destructiveContext = this.filterContextByChanges(options.currentContext, destructiveChanges);
|
|
18
|
+
const restoreWorkspace = restoreChanges.length > 0
|
|
19
|
+
? await this.gitProvider.checkoutArchive(options.projectRoot, options.fromRef)
|
|
20
|
+
: undefined;
|
|
21
|
+
const restoreContext = restoreWorkspace
|
|
22
|
+
? this.filterContextByChanges(await options.buildContext(restoreWorkspace.projectRoot), restoreChanges)
|
|
23
|
+
: undefined;
|
|
24
|
+
return {
|
|
25
|
+
summary: {
|
|
26
|
+
from: options.fromRef,
|
|
27
|
+
to: options.toRef,
|
|
28
|
+
changes,
|
|
29
|
+
destructiveComponents: collectContextNodeIds(destructiveContext),
|
|
30
|
+
restoreComponents: collectContextNodeIds(restoreContext),
|
|
31
|
+
},
|
|
32
|
+
destructiveContext: hasComponents(destructiveContext) ? destructiveContext : undefined,
|
|
33
|
+
restoreContext: hasComponents(restoreContext) ? restoreContext : undefined,
|
|
34
|
+
cleanup: async () => {
|
|
35
|
+
await restoreWorkspace?.cleanup();
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
filterContextByChanges(context, changes) {
|
|
40
|
+
const changedComponents = resolveChangedComponents(context.scanResult, changes);
|
|
41
|
+
const included = new Set(changedComponents.map((component) => toNodeId(component)));
|
|
42
|
+
const components = context.scanResult.components
|
|
43
|
+
.filter((component) => included.has(toNodeId(component)))
|
|
44
|
+
.map((component) => cloneComponent(component, included));
|
|
45
|
+
const graphBuilder = new DependencyGraphBuilder();
|
|
46
|
+
graphBuilder.addComponents(components);
|
|
47
|
+
const dependencyResult = graphBuilder.build();
|
|
48
|
+
return {
|
|
49
|
+
...context,
|
|
50
|
+
scanResult: {
|
|
51
|
+
...context.scanResult,
|
|
52
|
+
components,
|
|
53
|
+
dependencyResult,
|
|
54
|
+
},
|
|
55
|
+
orderedWaves: filterWaves(context.orderedWaves, included),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
class CliRollbackGitProvider {
|
|
60
|
+
async listChanges(projectRoot, fromRef, toRef) {
|
|
61
|
+
const { stdout } = await execFileAsync('git', ['diff', '--name-status', '--no-renames', `${fromRef}..${toRef}`], {
|
|
62
|
+
cwd: projectRoot,
|
|
63
|
+
});
|
|
64
|
+
return parseNameStatus(stdout);
|
|
65
|
+
}
|
|
66
|
+
async checkoutArchive(projectRoot, ref) {
|
|
67
|
+
const workspaceRoot = await mkdtemp(path.join(tmpdir(), 'smart-deployment-rollback-'));
|
|
68
|
+
const archivePath = path.join(workspaceRoot, 'source.tar');
|
|
69
|
+
await execFileAsync('git', ['archive', '--format=tar', '--output', archivePath, ref], { cwd: projectRoot });
|
|
70
|
+
await execFileAsync('tar', ['-xf', archivePath, '-C', workspaceRoot]);
|
|
71
|
+
await rm(archivePath, { force: true });
|
|
72
|
+
return {
|
|
73
|
+
projectRoot: workspaceRoot,
|
|
74
|
+
cleanup: async () => {
|
|
75
|
+
await rm(workspaceRoot, { recursive: true, force: true });
|
|
76
|
+
},
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function parseNameStatus(output) {
|
|
81
|
+
return output
|
|
82
|
+
.split('\n')
|
|
83
|
+
.map((line) => line.trim())
|
|
84
|
+
.filter(Boolean)
|
|
85
|
+
.map((line) => {
|
|
86
|
+
const [statusCode, filePath] = line.split(/\t+/);
|
|
87
|
+
return {
|
|
88
|
+
status: toRollbackStatus(statusCode),
|
|
89
|
+
path: normalizePath(filePath),
|
|
90
|
+
};
|
|
91
|
+
})
|
|
92
|
+
.sort((left, right) => left.path.localeCompare(right.path));
|
|
93
|
+
}
|
|
94
|
+
function toRollbackStatus(statusCode) {
|
|
95
|
+
if (statusCode.includes('A')) {
|
|
96
|
+
return 'added';
|
|
97
|
+
}
|
|
98
|
+
if (statusCode.includes('D')) {
|
|
99
|
+
return 'deleted';
|
|
100
|
+
}
|
|
101
|
+
return 'modified';
|
|
102
|
+
}
|
|
103
|
+
function resolveChangedComponents(scanResult, changes) {
|
|
104
|
+
const components = new Map();
|
|
105
|
+
for (const change of changes) {
|
|
106
|
+
const component = scanResult.components.find((candidate) => isComponentPathMatch(scanResult.projectRoot, candidate, change.path));
|
|
107
|
+
if (component) {
|
|
108
|
+
components.set(toNodeId(component), component);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return [...components.values()].sort((left, right) => toNodeId(left).localeCompare(toNodeId(right)));
|
|
112
|
+
}
|
|
113
|
+
function filterWaves(waves, included) {
|
|
114
|
+
return waves
|
|
115
|
+
.map((wave) => ({
|
|
116
|
+
...wave,
|
|
117
|
+
components: wave.components.filter((nodeId) => included.has(nodeId)),
|
|
118
|
+
}))
|
|
119
|
+
.filter((wave) => wave.components.length > 0)
|
|
120
|
+
.map((wave, index) => ({
|
|
121
|
+
...wave,
|
|
122
|
+
number: index + 1,
|
|
123
|
+
metadata: {
|
|
124
|
+
...wave.metadata,
|
|
125
|
+
componentCount: wave.components.length,
|
|
126
|
+
},
|
|
127
|
+
}));
|
|
128
|
+
}
|
|
129
|
+
function cloneComponent(component, included) {
|
|
130
|
+
return {
|
|
131
|
+
...component,
|
|
132
|
+
dependencies: filterNodeSet(component.dependencies, included),
|
|
133
|
+
optionalDependencies: component.optionalDependencies
|
|
134
|
+
? filterNodeSet(component.optionalDependencies, included)
|
|
135
|
+
: undefined,
|
|
136
|
+
dependencyDetails: component.dependencyDetails?.filter((dependency) => included.has(dependency.nodeId)),
|
|
137
|
+
dependents: filterNodeSet(component.dependents, included),
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
function filterNodeSet(values, included) {
|
|
141
|
+
return new Set([...values].filter((value) => included.has(value)));
|
|
142
|
+
}
|
|
143
|
+
function isComponentPathMatch(projectRoot, component, changedPath) {
|
|
144
|
+
const relativeComponentPath = path.isAbsolute(component.filePath)
|
|
145
|
+
? path.relative(projectRoot, component.filePath)
|
|
146
|
+
: component.filePath;
|
|
147
|
+
const componentPath = normalizePath(relativeComponentPath);
|
|
148
|
+
if (changedPath === componentPath || changedPath === `${componentPath}-meta.xml`) {
|
|
149
|
+
return true;
|
|
150
|
+
}
|
|
151
|
+
const bundleTypes = new Set([
|
|
152
|
+
'LightningComponentBundle',
|
|
153
|
+
'AuraDefinitionBundle',
|
|
154
|
+
'DigitalExperienceBundle',
|
|
155
|
+
'AiAuthoringBundle',
|
|
156
|
+
]);
|
|
157
|
+
if (!bundleTypes.has(component.type)) {
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
160
|
+
const componentDirectory = normalizePath(path.dirname(componentPath));
|
|
161
|
+
return changedPath.startsWith(`${componentDirectory}/`);
|
|
162
|
+
}
|
|
163
|
+
function collectContextNodeIds(context) {
|
|
164
|
+
return context?.scanResult.components.map((component) => toNodeId(component)).sort() ?? [];
|
|
165
|
+
}
|
|
166
|
+
function hasComponents(context) {
|
|
167
|
+
return (context?.scanResult.components.length ?? 0) > 0;
|
|
168
|
+
}
|
|
169
|
+
function normalizePath(filePath) {
|
|
170
|
+
return filePath.split(path.sep).join('/');
|
|
171
|
+
}
|
|
172
|
+
function toNodeId(component) {
|
|
173
|
+
return `${component.type}:${component.name}`;
|
|
174
|
+
}
|
|
175
|
+
export const rollbackPlanningInternals = {
|
|
176
|
+
parseNameStatus,
|
|
177
|
+
};
|
|
178
|
+
//# sourceMappingURL=rollback-planning-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rollback-planning-service.js","sourceRoot":"","sources":["../../src/deployment/rollback-planning-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
* @ac US-085-AC-6: Parse deployment results
|
|
11
11
|
* @issue #85
|
|
12
12
|
*/
|
|
13
|
+
import { type DeploymentDiagnostic } from './deployment-error-diagnostics.js';
|
|
13
14
|
export type TestLevel = 'NoTestRun' | 'RunSpecifiedTests' | 'RunLocalTests' | 'RunAllTestsInOrg';
|
|
14
15
|
export type DeploymentOptions = {
|
|
15
16
|
manifestPath: string;
|
|
@@ -18,6 +19,7 @@ export type DeploymentOptions = {
|
|
|
18
19
|
testLevel?: TestLevel;
|
|
19
20
|
tests?: string[];
|
|
20
21
|
checkOnly?: boolean;
|
|
22
|
+
postDestructiveChangesPath?: string;
|
|
21
23
|
};
|
|
22
24
|
export type DeploymentResult = {
|
|
23
25
|
success: boolean;
|
|
@@ -28,6 +30,7 @@ export type DeploymentResult = {
|
|
|
28
30
|
testsRun?: number;
|
|
29
31
|
testFailures?: number;
|
|
30
32
|
output: string;
|
|
33
|
+
diagnostics?: DeploymentDiagnostic[];
|
|
31
34
|
};
|
|
32
35
|
/**
|
|
33
36
|
* @ac US-085-AC-1: Execute sf project deploy start
|
|
@@ -40,4 +43,5 @@ export declare class SfCliIntegration {
|
|
|
40
43
|
private buildDeployCommand;
|
|
41
44
|
private parseDeploymentOutput;
|
|
42
45
|
checkDeploymentStatus(deploymentId: string, targetOrg: string): Promise<DeploymentResult>;
|
|
46
|
+
resumeDeployment(deploymentId: string, targetOrg: string): Promise<DeploymentResult>;
|
|
43
47
|
}
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
import { exec } from 'node:child_process';
|
|
14
14
|
import { promisify } from 'node:util';
|
|
15
15
|
import { getLogger } from '../utils/logger.js';
|
|
16
|
+
import { normalizeDeploymentDiagnostics } from './deployment-error-diagnostics.js';
|
|
16
17
|
const execAsync = promisify(exec);
|
|
17
18
|
const logger = getLogger('SfCliIntegration');
|
|
18
19
|
/**
|
|
@@ -48,6 +49,9 @@ export class SfCliIntegration {
|
|
|
48
49
|
'--json',
|
|
49
50
|
'--wait 60',
|
|
50
51
|
];
|
|
52
|
+
if (options.postDestructiveChangesPath) {
|
|
53
|
+
parts.push(`--post-destructive-changes ${options.postDestructiveChangesPath}`);
|
|
54
|
+
}
|
|
51
55
|
if (options.testLevel) {
|
|
52
56
|
parts.push(`--test-level ${options.testLevel}`);
|
|
53
57
|
}
|
|
@@ -65,8 +69,9 @@ export class SfCliIntegration {
|
|
|
65
69
|
const jsonMatch = output.match(/\{[\s\S]*\}/);
|
|
66
70
|
if (jsonMatch) {
|
|
67
71
|
const parsed = JSON.parse(jsonMatch[0]);
|
|
72
|
+
const success = !failed && (parsed.result?.status === 'Succeeded' || parsed.result?.status === 'Success');
|
|
68
73
|
return {
|
|
69
|
-
success
|
|
74
|
+
success,
|
|
70
75
|
deploymentId: parsed.result?.id,
|
|
71
76
|
status: parsed.result?.status ?? 'Unknown',
|
|
72
77
|
componentSuccesses: parsed.result?.numberComponentsDeployed ?? 0,
|
|
@@ -74,6 +79,7 @@ export class SfCliIntegration {
|
|
|
74
79
|
testsRun: parsed.result?.numberTestsTotal,
|
|
75
80
|
testFailures: parsed.result?.numberTestErrors,
|
|
76
81
|
output,
|
|
82
|
+
diagnostics: success ? undefined : normalizeDeploymentDiagnostics(output),
|
|
77
83
|
};
|
|
78
84
|
}
|
|
79
85
|
}
|
|
@@ -81,12 +87,14 @@ export class SfCliIntegration {
|
|
|
81
87
|
logger.warn('Failed to parse deployment output', { parseError });
|
|
82
88
|
}
|
|
83
89
|
// Fallback for non-JSON output
|
|
90
|
+
const success = !failed;
|
|
84
91
|
return {
|
|
85
|
-
success
|
|
92
|
+
success,
|
|
86
93
|
status: failed ? 'Failed' : 'Unknown',
|
|
87
94
|
componentSuccesses: 0,
|
|
88
95
|
componentFailures: failed ? 1 : 0,
|
|
89
96
|
output,
|
|
97
|
+
diagnostics: success ? undefined : normalizeDeploymentDiagnostics(output),
|
|
90
98
|
};
|
|
91
99
|
}
|
|
92
100
|
async checkDeploymentStatus(deploymentId, targetOrg) {
|
|
@@ -101,5 +109,17 @@ export class SfCliIntegration {
|
|
|
101
109
|
return this.parseDeploymentOutput(output, true);
|
|
102
110
|
}
|
|
103
111
|
}
|
|
112
|
+
async resumeDeployment(deploymentId, targetOrg) {
|
|
113
|
+
const command = `sf project deploy resume --job-id ${deploymentId} --target-org ${targetOrg} --json`;
|
|
114
|
+
try {
|
|
115
|
+
const { stdout, stderr } = await execAsync(command);
|
|
116
|
+
return this.parseDeploymentOutput(stdout + stderr);
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
logger.error('Failed to resume deployment', { error, deploymentId });
|
|
120
|
+
const output = error instanceof Error ? error.message : String(error);
|
|
121
|
+
return this.parseDeploymentOutput(output, true);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
104
124
|
}
|
|
105
125
|
//# sourceMappingURL=sf-cli-integration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sf-cli-integration.js","sourceRoot":"","sources":["../../src/deployment/sf-cli-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"sf-cli-integration.js","sourceRoot":"","sources":["../../src/deployment/sf-cli-integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,12 +37,15 @@ export class StartExecutionService {
|
|
|
37
37
|
return { kind: 'skipped', reason: 'validate-only' };
|
|
38
38
|
}
|
|
39
39
|
const { scanResult, orderedWaves, aiContext } = options.deploymentContext;
|
|
40
|
+
const destructive = options.destructive === true;
|
|
41
|
+
const executionWaves = destructive ? [...orderedWaves].reverse() : orderedWaves;
|
|
40
42
|
const testExecutor = this.testPlanService.createExecutor(scanResult.components);
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
const remediationPlan = destructive
|
|
44
|
+
? undefined
|
|
45
|
+
: new CycleRemediationPlanner(scanResult.dependencyResult.graph, {
|
|
46
|
+
components: scanResult.dependencyResult.components,
|
|
47
|
+
}).createPlan();
|
|
48
|
+
if (remediationPlan && remediationPlan.cycles.length > 0) {
|
|
46
49
|
options.log(`♻️ Detected ${remediationPlan.cycles.length} circular dependency cycle(s).`);
|
|
47
50
|
if (!options.allowCycleRemediation) {
|
|
48
51
|
throw new Error('Circular dependencies detected. Re-run with --allow-cycle-remediation for supported ApexClass cycles or resolve them manually.');
|
|
@@ -61,8 +64,10 @@ export class StartExecutionService {
|
|
|
61
64
|
if (!options.targetOrg) {
|
|
62
65
|
throw new Error('The --target-org flag is required for real deployments.');
|
|
63
66
|
}
|
|
64
|
-
|
|
65
|
-
|
|
67
|
+
if (!destructive) {
|
|
68
|
+
await this.assertDynamicQueryFieldsAreSafe(scanResult.dependencyResult, options.targetOrg);
|
|
69
|
+
}
|
|
70
|
+
if (remediationPlan && remediationPlan.cycles.length > 0) {
|
|
66
71
|
await this.cycleRemediationRunner.execute({
|
|
67
72
|
deploymentId,
|
|
68
73
|
targetOrg: options.targetOrg,
|
|
@@ -82,7 +87,7 @@ export class StartExecutionService {
|
|
|
82
87
|
deploymentId,
|
|
83
88
|
targetOrg: options.targetOrg,
|
|
84
89
|
sourcePath: options.sourcePath,
|
|
85
|
-
orderedWaves,
|
|
90
|
+
orderedWaves: executionWaves,
|
|
86
91
|
dependencyGraph: scanResult.dependencyResult.graph,
|
|
87
92
|
componentMap: scanResult.dependencyResult.components,
|
|
88
93
|
apiVersion: scanResult.apiVersion,
|
|
@@ -92,6 +97,7 @@ export class StartExecutionService {
|
|
|
92
97
|
stateManager,
|
|
93
98
|
sfCli,
|
|
94
99
|
aiContext,
|
|
100
|
+
mode: destructive ? 'destructive' : 'deploy',
|
|
95
101
|
log: options.log,
|
|
96
102
|
});
|
|
97
103
|
return { kind: 'executed' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start-execution-service.js","sourceRoot":"","sources":["../../src/deployment/start-execution-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EACL,2BAA2B,GAE5B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"start-execution-service.js","sourceRoot":"","sources":["../../src/deployment/start-execution-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,14 @@ export type WaveManifestParams = {
|
|
|
7
7
|
componentMap: ReadonlyMap<NodeId, MetadataComponent>;
|
|
8
8
|
apiVersion?: string;
|
|
9
9
|
};
|
|
10
|
+
export type DestructiveWaveManifestResult = {
|
|
11
|
+
packagePath: string;
|
|
12
|
+
destructiveChangesPath: string;
|
|
13
|
+
};
|
|
10
14
|
export declare class WaveManifestService {
|
|
11
15
|
generateManifest(params: WaveManifestParams): Promise<string>;
|
|
16
|
+
generateDestructiveManifest(params: WaveManifestParams): Promise<DestructiveWaveManifestResult>;
|
|
17
|
+
private ensureManifestDir;
|
|
18
|
+
private buildPackageXml;
|
|
19
|
+
private buildTypeBlocks;
|
|
12
20
|
}
|