sfdx-git-delta 6.41.1 → 6.42.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/README.md +35 -3
- package/lib/adapter/GitAdapter.d.ts +4 -1
- package/lib/adapter/GitAdapter.js +113 -59
- package/lib/adapter/GitAdapter.js.map +1 -1
- package/lib/adapter/gitBatchCatFile.d.ts +4 -1
- package/lib/adapter/gitBatchCatFile.js +30 -8
- package/lib/adapter/gitBatchCatFile.js.map +1 -1
- package/lib/adapter/treeIndex.d.ts +18 -0
- package/lib/adapter/treeIndex.js +75 -0
- package/lib/adapter/treeIndex.js.map +1 -0
- package/lib/commands/sgd/source/delta.d.ts +2 -0
- package/lib/commands/sgd/source/delta.js +31 -1
- package/lib/commands/sgd/source/delta.js.map +1 -1
- package/lib/constant/cliConstants.d.ts +2 -0
- package/lib/constant/cliConstants.js +4 -0
- package/lib/constant/cliConstants.js.map +1 -1
- package/lib/constant/gitConstants.d.ts +1 -0
- package/lib/constant/gitConstants.js +4 -0
- package/lib/constant/gitConstants.js.map +1 -1
- package/lib/main.js +14 -4
- package/lib/main.js.map +1 -1
- package/lib/metadata/MetadataRepository.d.ts +1 -0
- package/lib/metadata/MetadataRepositoryImpl.d.ts +1 -0
- package/lib/metadata/MetadataRepositoryImpl.js +13 -12
- package/lib/metadata/MetadataRepositoryImpl.js.map +1 -1
- package/lib/metadata/metadataManager.js +22 -14
- package/lib/metadata/metadataManager.js.map +1 -1
- package/lib/post-processor/changesManifestProcessor.d.ts +15 -0
- package/lib/post-processor/changesManifestProcessor.js +50 -0
- package/lib/post-processor/changesManifestProcessor.js.map +1 -0
- package/lib/post-processor/flowTranslationProcessor.d.ts +2 -1
- package/lib/post-processor/flowTranslationProcessor.js +12 -4
- package/lib/post-processor/flowTranslationProcessor.js.map +1 -1
- package/lib/post-processor/packageGenerator.d.ts +0 -2
- package/lib/post-processor/packageGenerator.js +7 -18
- package/lib/post-processor/packageGenerator.js.map +1 -1
- package/lib/post-processor/postProcessorManager.js +6 -1
- package/lib/post-processor/postProcessorManager.js.map +1 -1
- package/lib/service/botHandler.js +1 -0
- package/lib/service/botHandler.js.map +1 -1
- package/lib/service/inBundleHandler.js +7 -1
- package/lib/service/inBundleHandler.js.map +1 -1
- package/lib/service/inFileHandler.d.ts +2 -2
- package/lib/service/inFileHandler.js +7 -5
- package/lib/service/inFileHandler.js.map +1 -1
- package/lib/service/inResourceHandler.js +9 -1
- package/lib/service/inResourceHandler.js.map +1 -1
- package/lib/service/reportingFolderHandler.d.ts +5 -2
- package/lib/service/reportingFolderHandler.js +5 -2
- package/lib/service/reportingFolderHandler.js.map +1 -1
- package/lib/service/sharedFolderHandler.d.ts +5 -2
- package/lib/service/sharedFolderHandler.js +5 -2
- package/lib/service/sharedFolderHandler.js.map +1 -1
- package/lib/service/standardHandler.d.ts +8 -2
- package/lib/service/standardHandler.js +21 -3
- package/lib/service/standardHandler.js.map +1 -1
- package/lib/service/typeHandlerFactory.d.ts +1 -2
- package/lib/service/typeHandlerFactory.js +8 -9
- package/lib/service/typeHandlerFactory.js.map +1 -1
- package/lib/types/config.d.ts +1 -0
- package/lib/types/handlerResult.d.ts +8 -0
- package/lib/types/handlerResult.js +7 -0
- package/lib/types/handlerResult.js.map +1 -1
- package/lib/types/work.d.ts +2 -5
- package/lib/utils/LoggingDecorator.d.ts +1 -1
- package/lib/utils/LoggingDecorator.js +26 -10
- package/lib/utils/LoggingDecorator.js.map +1 -1
- package/lib/utils/changeSet.d.ts +48 -0
- package/lib/utils/changeSet.js +173 -0
- package/lib/utils/changeSet.js.map +1 -0
- package/lib/utils/configValidator.d.ts +1 -0
- package/lib/utils/configValidator.js +43 -7
- package/lib/utils/configValidator.js.map +1 -1
- package/lib/utils/fsHelper.d.ts +1 -0
- package/lib/utils/fsHelper.js +3 -0
- package/lib/utils/fsHelper.js.map +1 -1
- package/lib/utils/ignoreHelper.d.ts +2 -0
- package/lib/utils/ignoreHelper.js +21 -19
- package/lib/utils/ignoreHelper.js.map +1 -1
- package/lib/utils/metadataDiff.d.ts +1 -0
- package/lib/utils/metadataDiff.js +24 -9
- package/lib/utils/metadataDiff.js.map +1 -1
- package/lib/utils/metadataElement.js +1 -3
- package/lib/utils/metadataElement.js.map +1 -1
- package/lib/utils/packageHelper.js +7 -3
- package/lib/utils/packageHelper.js.map +1 -1
- package/lib/utils/renameResolver.d.ts +19 -0
- package/lib/utils/renameResolver.js +52 -0
- package/lib/utils/renameResolver.js.map +1 -0
- package/lib/utils/repoGitDiff.d.ts +7 -0
- package/lib/utils/repoGitDiff.js +37 -8
- package/lib/utils/repoGitDiff.js.map +1 -1
- package/lib/utils/xmlHelper.js +7 -5
- package/lib/utils/xmlHelper.js.map +1 -1
- package/messages/delta.md +12 -0
- package/npm-shrinkwrap.json +482 -498
- package/oclif.manifest.json +9 -1
- package/package.json +19 -16
- package/lib/utils/manifestAggregator.d.ts +0 -3
- package/lib/utils/manifestAggregator.js +0 -22
- package/lib/utils/manifestAggregator.js.map +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
|
+
import { join } from 'node:path/posix';
|
|
2
3
|
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
|
-
import { OUTPUT_DEFAULT_VALUE, REPO_DEFAULT_VALUE, SOURCE_DEFAULT_VALUE, TO_DEFAULT_VALUE, } from '../../../constant/cliConstants.js';
|
|
4
|
+
import { CHANGES_MANIFEST_BARE_MARKER, CHANGES_MANIFEST_DEFAULT_FILENAME, OUTPUT_DEFAULT_VALUE, REPO_DEFAULT_VALUE, SOURCE_DEFAULT_VALUE, TO_DEFAULT_VALUE, } from '../../../constant/cliConstants.js';
|
|
4
5
|
import sgd from '../../../main.js';
|
|
5
6
|
import { log } from '../../../utils/LoggingDecorator.js';
|
|
6
7
|
import { Logger } from '../../../utils/LoggingService.js';
|
|
@@ -83,6 +84,10 @@ export default class SourceDeltaGenerate extends SfCommand {
|
|
|
83
84
|
summary: messages.getMessage('flags.additional-metadata-registry.summary'),
|
|
84
85
|
exists: true,
|
|
85
86
|
}),
|
|
87
|
+
'changes-manifest': Flags.string({
|
|
88
|
+
char: 'c',
|
|
89
|
+
summary: messages.getMessage('flags.changes-manifest.summary'),
|
|
90
|
+
}),
|
|
86
91
|
'ignore-whitespace': Flags.boolean({
|
|
87
92
|
char: 'W',
|
|
88
93
|
summary: messages.getMessage('flags.ignore-whitespace.summary'),
|
|
@@ -92,11 +97,36 @@ export default class SourceDeltaGenerate extends SfCommand {
|
|
|
92
97
|
summary: messages.getMessage('flags.api-version.summary'),
|
|
93
98
|
}),
|
|
94
99
|
};
|
|
100
|
+
// oclif's string flags require a value. To let users pass `-c` without a
|
|
101
|
+
// value (and fall back to <output>/changes.manifest.json), rewrite bare
|
|
102
|
+
// occurrences in argv into a known marker that we resolve after parsing.
|
|
103
|
+
static _expandBareChangesManifest(argv) {
|
|
104
|
+
const aliases = new Set(['--changes-manifest', '-c']);
|
|
105
|
+
const result = [];
|
|
106
|
+
for (let i = 0; i < argv.length; i++) {
|
|
107
|
+
const arg = argv[i];
|
|
108
|
+
result.push(arg);
|
|
109
|
+
if (aliases.has(arg)) {
|
|
110
|
+
const next = argv[i + 1];
|
|
111
|
+
if (next === undefined || next.startsWith('-')) {
|
|
112
|
+
result.push(CHANGES_MANIFEST_BARE_MARKER);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return result;
|
|
117
|
+
}
|
|
118
|
+
/* v8 ignore start -- oclif command entry: behaviour covered via NUT tests (delta.nut.ts) */
|
|
95
119
|
async run() {
|
|
120
|
+
this.argv = SourceDeltaGenerate._expandBareChangesManifest(this.argv);
|
|
96
121
|
const { flags } = await this.parse(SourceDeltaGenerate);
|
|
122
|
+
const rawChangesManifest = flags['changes-manifest'];
|
|
123
|
+
const changesManifest = rawChangesManifest === CHANGES_MANIFEST_BARE_MARKER
|
|
124
|
+
? join(flags['output-dir'], CHANGES_MANIFEST_DEFAULT_FILENAME)
|
|
125
|
+
: rawChangesManifest;
|
|
97
126
|
const config = {
|
|
98
127
|
apiVersion: parseInt(flags['api-version']) || undefined,
|
|
99
128
|
additionalMetadataRegistryPath: flags['additional-metadata-registry'],
|
|
129
|
+
changesManifest,
|
|
100
130
|
from: flags['from'],
|
|
101
131
|
generateDelta: flags['generate-delta'],
|
|
102
132
|
ignore: flags['ignore-file'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delta.js","sourceRoot":"","sources":["../../../../src/commands/sgd/source/delta.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,3 +3,5 @@ export declare const OUTPUT_DEFAULT_VALUE = "./output";
|
|
|
3
3
|
export declare const SOURCE_DEFAULT_VALUE = "./";
|
|
4
4
|
export declare const REPO_DEFAULT_VALUE = "./";
|
|
5
5
|
export declare const TAB = "\t";
|
|
6
|
+
export declare const CHANGES_MANIFEST_DEFAULT_FILENAME = "changes.manifest.json";
|
|
7
|
+
export declare const CHANGES_MANIFEST_BARE_MARKER = "__SGD_CHANGES_MANIFEST_DEFAULT__";
|
|
@@ -4,4 +4,8 @@ export const OUTPUT_DEFAULT_VALUE = './output';
|
|
|
4
4
|
export const SOURCE_DEFAULT_VALUE = './';
|
|
5
5
|
export const REPO_DEFAULT_VALUE = './';
|
|
6
6
|
export const TAB = '\t';
|
|
7
|
+
export const CHANGES_MANIFEST_DEFAULT_FILENAME = 'changes.manifest.json';
|
|
8
|
+
// Unique internal marker injected when --changes-manifest is passed without a
|
|
9
|
+
// value. Replaced with the resolved default path after flag parsing.
|
|
10
|
+
export const CHANGES_MANIFEST_BARE_MARKER = '__SGD_CHANGES_MANIFEST_DEFAULT__';
|
|
7
11
|
//# sourceMappingURL=cliConstants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliConstants.js","sourceRoot":"","sources":["../../src/constant/cliConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAA;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AACtC,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,CAAA"}
|
|
1
|
+
{"version":3,"file":"cliConstants.js","sourceRoot":"","sources":["../../src/constant/cliConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AACpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAA;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAA;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AACtC,MAAM,CAAC,MAAM,GAAG,GAAG,IAAI,CAAA;AACvB,MAAM,CAAC,MAAM,iCAAiC,GAAG,uBAAuB,CAAA;AACxE,8EAA8E;AAC9E,qEAAqE;AACrE,MAAM,CAAC,MAAM,4BAA4B,GAAG,kCAAkC,CAAA"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
export const ADDITION = 'A';
|
|
3
3
|
export const DELETION = 'D';
|
|
4
|
+
// git -M rename status lines start with "R" followed by a 3-digit similarity
|
|
5
|
+
// score (e.g. "R095"). We match on the leading letter rather than the full
|
|
6
|
+
// prefix because the score is not fixed-width across git versions.
|
|
7
|
+
export const RENAMED = 'R';
|
|
4
8
|
export const GIT_DIFF_TYPE_REGEX = /^.\s+/u;
|
|
5
9
|
export const GIT_FOLDER = '.git';
|
|
6
10
|
export const HEAD = 'HEAD';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/constant/gitConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAA;AAChC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAA;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAA"}
|
|
1
|
+
{"version":3,"file":"gitConstants.js","sourceRoot":"","sources":["../../src/constant/gitConstants.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAA;AAC3B,6EAA6E;AAC7E,2EAA2E;AAC3E,mEAAmE;AACnE,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAA;AAC1B,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAA;AAChC,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAA;AAC1B,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,oBAAoB;IACpB,sBAAsB;IACtB,oBAAoB;IACpB,mBAAmB;IACnB,iCAAiC;CAClC,CAAA;AACD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAA;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAA"}
|
package/lib/main.js
CHANGED
|
@@ -6,9 +6,10 @@ import { getPostProcessors } from './post-processor/postProcessorManager.js';
|
|
|
6
6
|
import DiffLineInterpreter from './service/diffLineInterpreter.js';
|
|
7
7
|
import { mergeResults } from './types/handlerResult.js';
|
|
8
8
|
import { pushAll } from './utils/arrayUtils.js';
|
|
9
|
+
import ChangeSet from './utils/changeSet.js';
|
|
9
10
|
import ConfigValidator from './utils/configValidator.js';
|
|
10
11
|
import { Logger, lazy } from './utils/LoggingService.js';
|
|
11
|
-
import
|
|
12
|
+
import RenameResolver from './utils/renameResolver.js';
|
|
12
13
|
import RepoGitDiff from './utils/repoGitDiff.js';
|
|
13
14
|
import { computeTreeIndexScope } from './utils/treeIndexScope.js';
|
|
14
15
|
export default async (config) => {
|
|
@@ -16,7 +17,7 @@ export default async (config) => {
|
|
|
16
17
|
Logger.debug(lazy `main: arguments ${config}`);
|
|
17
18
|
const work = {
|
|
18
19
|
config,
|
|
19
|
-
|
|
20
|
+
changes: new ChangeSet(),
|
|
20
21
|
warnings: [],
|
|
21
22
|
};
|
|
22
23
|
try {
|
|
@@ -40,11 +41,20 @@ export default async (config) => {
|
|
|
40
41
|
}
|
|
41
42
|
const lineProcessor = new DiffLineInterpreter(work, metadata);
|
|
42
43
|
const postProcessors = getPostProcessors(work, metadata);
|
|
44
|
+
// First pass: build the ChangeSet from handler output so collectors
|
|
45
|
+
// (e.g. FlowTranslationProcessor) can introspect the package view via
|
|
46
|
+
// work.changes.forPackageManifest() before emitting their own manifests.
|
|
43
47
|
const handlerResult = await lineProcessor.process(lines);
|
|
44
|
-
work.
|
|
48
|
+
work.changes = ChangeSet.from(handlerResult.manifests);
|
|
49
|
+
// Second pass: rebuild once collector output is merged in.
|
|
45
50
|
const postResult = await postProcessors.collectAll();
|
|
46
51
|
const combinedResult = mergeResults(handlerResult, postResult);
|
|
47
|
-
work.
|
|
52
|
+
work.changes = ChangeSet.from(combinedResult.manifests);
|
|
53
|
+
// Apply git-detected renames: resolve the `{fromPath, toPath}` pairs that
|
|
54
|
+
// RepoGitDiff captured from `-M` output into (type, from, to) triples and
|
|
55
|
+
// re-group them into the ChangeSet's rename bucket. Pairs for ignored
|
|
56
|
+
// paths or bundle helper files (same member on both sides) are no-ops.
|
|
57
|
+
await new RenameResolver(work, metadata).apply(work.changes, repoGitDiffHelper.getRenamePairs());
|
|
48
58
|
pushAll(work.warnings, combinedResult.warnings);
|
|
49
59
|
await new IOExecutor(config).execute(combinedResult.copies);
|
|
50
60
|
await postProcessors.executeRemaining();
|
package/lib/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,UAAU,MAAM,yBAAyB,CAAA;AAChD,OAAO,UAAU,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAC5E,OAAO,mBAAmB,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,eAAe,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { Metadata } from '../types/metadata.js';
|
|
|
2
2
|
export interface MetadataRepository {
|
|
3
3
|
has(path: string): boolean;
|
|
4
4
|
get(path: string): Metadata | undefined;
|
|
5
|
+
getByXmlName(xmlName: string): Metadata | undefined;
|
|
5
6
|
getFullyQualifiedName(path: string): string;
|
|
6
7
|
values(): Metadata[];
|
|
7
8
|
}
|
|
@@ -15,6 +15,7 @@ export declare class MetadataRepositoryImpl implements MetadataRepository {
|
|
|
15
15
|
protected searchByExtension(parts: string[]): Metadata | undefined;
|
|
16
16
|
protected searchByDirectory(parts: string[]): Metadata | undefined;
|
|
17
17
|
protected searchByXmlName(xmlName: string): Metadata | undefined;
|
|
18
|
+
getByXmlName(xmlName: string): Metadata | undefined;
|
|
18
19
|
getFullyQualifiedName(path: string): string;
|
|
19
20
|
values(): Metadata[];
|
|
20
21
|
private static UNSAFE_EXTENSION;
|
|
@@ -4,6 +4,7 @@ import { parse } from 'node:path/posix';
|
|
|
4
4
|
import { DOT, PATH_SEP } from '../constant/fsConstants.js';
|
|
5
5
|
import { CUSTOM_APPLICATION_SUFFIX, CUSTOM_METADATA_SUFFIX, EMAIL_SERVICES_FUNCTION_SUFFIX, METAFILE_SUFFIX, OBJECT_TRANSLATION_TYPE, OBJECT_TYPE, PERMISSIONSET_TYPE, SHARING_RULE_TYPE, SUB_OBJECT_TYPES, WORKFLOW_TYPE, } from '../constant/metadataConstants.js';
|
|
6
6
|
import { log } from '../utils/LoggingDecorator.js';
|
|
7
|
+
const PATH_SEP_GLOBAL = new RegExp(PATH_SEP, 'g');
|
|
7
8
|
export class MetadataRepositoryImpl {
|
|
8
9
|
metadatas;
|
|
9
10
|
metadataPerExt;
|
|
@@ -32,17 +33,14 @@ export class MetadataRepositoryImpl {
|
|
|
32
33
|
this.addSharedFolderSuffix(metadata);
|
|
33
34
|
}
|
|
34
35
|
addSharedFolderSuffix(metadata) {
|
|
35
|
-
if (metadata.content)
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
suffix: sharedFolderMetadataDef.suffix,
|
|
44
|
-
});
|
|
45
|
-
}
|
|
36
|
+
if (!metadata.content)
|
|
37
|
+
return;
|
|
38
|
+
const { content: _content, ...metadataWithoutContent } = metadata;
|
|
39
|
+
for (const sharedFolderMetadataDef of metadata.content) {
|
|
40
|
+
this.addSuffix({
|
|
41
|
+
...metadataWithoutContent,
|
|
42
|
+
suffix: sharedFolderMetadataDef.suffix,
|
|
43
|
+
});
|
|
46
44
|
}
|
|
47
45
|
}
|
|
48
46
|
addFolder(metadata) {
|
|
@@ -86,6 +84,9 @@ export class MetadataRepositoryImpl {
|
|
|
86
84
|
searchByXmlName(xmlName) {
|
|
87
85
|
return this.metadataPerXmlName.get(xmlName);
|
|
88
86
|
}
|
|
87
|
+
getByXmlName(xmlName) {
|
|
88
|
+
return this.metadataPerXmlName.get(xmlName);
|
|
89
|
+
}
|
|
89
90
|
getFullyQualifiedName(path) {
|
|
90
91
|
let fullyQualifiedName = parse(path).base;
|
|
91
92
|
const type = this.get(path);
|
|
@@ -95,7 +96,7 @@ export class MetadataRepositoryImpl {
|
|
|
95
96
|
.find(part => this.metadataPerDir.has(part));
|
|
96
97
|
fullyQualifiedName = path
|
|
97
98
|
.slice(path.indexOf(parentType))
|
|
98
|
-
.replace(
|
|
99
|
+
.replace(PATH_SEP_GLOBAL, '');
|
|
99
100
|
}
|
|
100
101
|
return fullyQualifiedName;
|
|
101
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataRepositoryImpl.js","sourceRoot":"","sources":["../../src/metadata/MetadataRepositoryImpl.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAEvC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,8BAA8B,EAC9B,eAAe,EACf,uBAAuB,EACvB,WAAW,EACX,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,GACd,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAGlD,MAAM,OAAO,sBAAsB;IAIF;IAHZ,cAAc,CAAuB;IACrC,cAAc,CAAuB;IACrC,kBAAkB,CAAuB;IAC5D,YAA+B,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAClD,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAA;QACjD,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAA;QACjD,IAAI,CAAC,kBAAkB,GAAG,IAAI,GAAG,EAAoB,CAAA;QAErD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YACxB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YACxB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;IACJ,CAAC;IAES,SAAS,CAAC,QAAkB;QACpC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7C,sBAAsB,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAC9D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACpD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IAES,qBAAqB,CAAC,QAAkB;QAChD,IAAI,QAAQ,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"MetadataRepositoryImpl.js","sourceRoot":"","sources":["../../src/metadata/MetadataRepositoryImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,15 @@ import { MetadataDefinitionMerger } from './metadataDefinitionMerger.js';
|
|
|
9
9
|
import { SDRMetadataAdapter } from './sdrMetadataAdapter.js';
|
|
10
10
|
let inFileMetadata = new Map();
|
|
11
11
|
let sharedFolderMetadata = new Map();
|
|
12
|
+
let packableByXmlName = new Map();
|
|
12
13
|
// For testing - clears the cached metadata maps
|
|
13
14
|
export const resetMetadataCache = () => {
|
|
14
15
|
inFileMetadata = new Map();
|
|
15
16
|
sharedFolderMetadata = new Map();
|
|
17
|
+
packableByXmlName = new Map();
|
|
16
18
|
};
|
|
17
19
|
export const getLatestSupportedVersion = async () => {
|
|
18
|
-
return parseInt(await SDRMetadataAdapter.getLatestApiVersion());
|
|
20
|
+
return parseInt(await SDRMetadataAdapter.getLatestApiVersion(), 10);
|
|
19
21
|
};
|
|
20
22
|
export const getDefinition = async (config) => {
|
|
21
23
|
const { additionalMetadataRegistryPath } = config;
|
|
@@ -61,27 +63,33 @@ export const getDefinition = async (config) => {
|
|
|
61
63
|
const metadataRepository = new MetadataRepositoryImpl(finalMetadata);
|
|
62
64
|
return metadataRepository;
|
|
63
65
|
};
|
|
64
|
-
export const isPackable = (type) =>
|
|
66
|
+
export const isPackable = (type) => packableByXmlName.get(type) !== false;
|
|
65
67
|
const granularExcludedTypes = new Set([
|
|
66
68
|
'Translations',
|
|
67
69
|
'StandardValueSetTranslation',
|
|
68
70
|
'GlobalValueSetTranslation',
|
|
69
71
|
]);
|
|
70
|
-
export const getInFileAttributes = (metadata) =>
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
export const getInFileAttributes = (metadata) => {
|
|
73
|
+
if (inFileMetadata.size)
|
|
74
|
+
return inFileMetadata;
|
|
75
|
+
for (const meta of metadata.values()) {
|
|
76
|
+
if (!meta.xmlTag)
|
|
77
|
+
continue;
|
|
76
78
|
const isExcluded = granularExcludedTypes.has(meta.parentXmlName || '') ||
|
|
77
|
-
granularExcludedTypes.has(meta.xmlName || '')
|
|
78
|
-
|
|
79
|
+
granularExcludedTypes.has(meta.xmlName || '') ||
|
|
80
|
+
!!meta.excluded;
|
|
81
|
+
const entry = {
|
|
79
82
|
xmlName: meta.xmlName,
|
|
80
83
|
key: meta.key,
|
|
81
|
-
excluded: isExcluded
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
|
|
84
|
+
excluded: isExcluded,
|
|
85
|
+
};
|
|
86
|
+
inFileMetadata.set(meta.xmlTag, entry);
|
|
87
|
+
if (meta.xmlName) {
|
|
88
|
+
packableByXmlName.set(meta.xmlName, !isExcluded);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return inFileMetadata;
|
|
92
|
+
};
|
|
85
93
|
export const getSharedFolderMetadata = (metadata) => sharedFolderMetadata.size
|
|
86
94
|
? sharedFolderMetadata
|
|
87
95
|
: metadata
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataManager.js","sourceRoot":"","sources":["../../src/metadata/metadataManager.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AACZ,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAGL,mBAAmB,GAGpB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,gBAAgB,MAAM,uBAAuB,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE5D,IAAI,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAA;AAC1D,IAAI,oBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"metadataManager.js","sourceRoot":"","sources":["../../src/metadata/metadataManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Manifest } from '../types/work.js';
|
|
2
|
+
import type { RenameBucket } from '../utils/changeSet.js';
|
|
3
|
+
import BaseProcessor from './baseProcessor.js';
|
|
4
|
+
type RenameEntry = {
|
|
5
|
+
from: string;
|
|
6
|
+
to: string;
|
|
7
|
+
};
|
|
8
|
+
type KindBucket = Record<string, string[]>;
|
|
9
|
+
type RenameTypeBucket = Record<string, RenameEntry[]>;
|
|
10
|
+
export default class ChangesManifestProcessor extends BaseProcessor {
|
|
11
|
+
process(): Promise<void>;
|
|
12
|
+
protected _buildKindBucket(manifest: Manifest): KindBucket;
|
|
13
|
+
protected _buildRenameBucket(renames: RenameBucket): RenameTypeBucket;
|
|
14
|
+
}
|
|
15
|
+
export {};
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
import { __decorate } from "tslib";
|
|
3
|
+
import { outputFile } from 'fs-extra';
|
|
4
|
+
import { ChangeKind } from '../types/handlerResult.js';
|
|
5
|
+
import { log } from '../utils/LoggingDecorator.js';
|
|
6
|
+
import BaseProcessor from './baseProcessor.js';
|
|
7
|
+
export default class ChangesManifestProcessor extends BaseProcessor {
|
|
8
|
+
async process() {
|
|
9
|
+
// Path resolution policy (see delta.ts flag parsing):
|
|
10
|
+
// - bare `-c` is rewritten to <output>/changes.manifest.json at CLI time
|
|
11
|
+
// - explicit value is resolved against cwd (relative) or used as-is
|
|
12
|
+
// (absolute) — same convention as --ignore-file etc.
|
|
13
|
+
const targetPath = this.config.changesManifest;
|
|
14
|
+
if (!targetPath)
|
|
15
|
+
return;
|
|
16
|
+
// ChangeSet.byChangeKind() already coalesces the delete bucket against
|
|
17
|
+
// add/modify/rename, and removes rename participants from add/delete, so
|
|
18
|
+
// the JSON view never lists the same component twice.
|
|
19
|
+
const view = this.work.changes.byChangeKind();
|
|
20
|
+
const payload = {
|
|
21
|
+
[ChangeKind.Add]: this._buildKindBucket(view[ChangeKind.Add]),
|
|
22
|
+
[ChangeKind.Modify]: this._buildKindBucket(view[ChangeKind.Modify]),
|
|
23
|
+
[ChangeKind.Delete]: this._buildKindBucket(view[ChangeKind.Delete]),
|
|
24
|
+
[ChangeKind.Rename]: this._buildRenameBucket(view[ChangeKind.Rename]),
|
|
25
|
+
};
|
|
26
|
+
await outputFile(targetPath, JSON.stringify(payload, null, 2));
|
|
27
|
+
}
|
|
28
|
+
_buildKindBucket(manifest) {
|
|
29
|
+
const bucket = {};
|
|
30
|
+
// `!` is safe: keys come from manifest.keys() so get() cannot be undefined.
|
|
31
|
+
for (const type of [...manifest.keys()].sort()) {
|
|
32
|
+
bucket[type] = [...manifest.get(type)].sort();
|
|
33
|
+
}
|
|
34
|
+
return bucket;
|
|
35
|
+
}
|
|
36
|
+
_buildRenameBucket(renames) {
|
|
37
|
+
const bucket = {};
|
|
38
|
+
for (const type of [...renames.keys()].sort()) {
|
|
39
|
+
const pairs = [...renames.get(type).values()]
|
|
40
|
+
.map(({ from, to }) => ({ from, to }))
|
|
41
|
+
.sort((a, b) => a.to.localeCompare(b.to));
|
|
42
|
+
bucket[type] = pairs;
|
|
43
|
+
}
|
|
44
|
+
return bucket;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
__decorate([
|
|
48
|
+
log
|
|
49
|
+
], ChangesManifestProcessor.prototype, "process", null);
|
|
50
|
+
//# sourceMappingURL=changesManifestProcessor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changesManifestProcessor.js","sourceRoot":"","sources":["../../src/post-processor/changesManifestProcessor.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAGtD,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAY9C,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,aAAa;IAE3C,AAAN,KAAK,CAAC,OAAO;QAC3B,sDAAsD;QACtD,2EAA2E;QAC3E,sEAAsE;QACtE,yDAAyD;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAA;QAC9C,IAAI,CAAC,UAAU;YAAE,OAAM;QAEvB,uEAAuE;QACvE,yEAAyE;QACzE,sDAAsD;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAA;QAC7C,MAAM,OAAO,GAA0B;YACrC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC7D,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SACtE,CAAA;QACD,MAAM,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IAES,gBAAgB,CAAC,QAAkB;QAC3C,MAAM,MAAM,GAAe,EAAE,CAAA;QAC7B,4EAA4E;QAC5E,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAChD,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,kBAAkB,CAAC,OAAqB;QAChD,MAAM,MAAM,GAAqB,EAAE,CAAA;QACnC,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,MAAM,EAAE,CAAC;iBAC3C,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;iBACrC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QACtB,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAxCuB;IADrB,GAAG;uDAoBH"}
|
|
@@ -22,6 +22,7 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
22
22
|
protected readonly translations: Map<string, FlowDefinition[]>;
|
|
23
23
|
protected ignoreHelper: IgnoreHelper | undefined;
|
|
24
24
|
protected isOutputEqualsToRepo: boolean | undefined;
|
|
25
|
+
protected packagedFlows: Set<string>;
|
|
25
26
|
constructor(work: Work, metadata: MetadataRepository);
|
|
26
27
|
get isCollector(): boolean;
|
|
27
28
|
process(): Promise<void>;
|
|
@@ -36,6 +37,6 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
36
37
|
flowDefinition: FlowDefinition;
|
|
37
38
|
}): void;
|
|
38
39
|
protected _getTranslationAsJSON(translationPath: string): Promise<TranslationsContent>;
|
|
39
|
-
_shouldProcess(): boolean;
|
|
40
|
+
protected _shouldProcess(): boolean;
|
|
40
41
|
}
|
|
41
42
|
export {};
|
|
@@ -3,7 +3,7 @@ import { __decorate } from "tslib";
|
|
|
3
3
|
import { join, parse } from 'node:path/posix';
|
|
4
4
|
import { castArray } from 'lodash-es';
|
|
5
5
|
import { FLOW_XML_NAME, META_REGEX, METAFILE_SUFFIX, TRANSLATION_EXTENSION, TRANSLATION_TYPE, } from '../constant/metadataConstants.js';
|
|
6
|
-
import { CopyOperationKind, emptyResult, ManifestTarget, } from '../types/handlerResult.js';
|
|
6
|
+
import { ChangeKind, CopyOperationKind, emptyResult, ManifestTarget, } from '../types/handlerResult.js';
|
|
7
7
|
import { grepContent } from '../utils/fsHelper.js';
|
|
8
8
|
import { isSamePath, isSubDir, pathExists, readFile } from '../utils/fsUtils.js';
|
|
9
9
|
import { buildIgnoreHelper } from '../utils/ignoreHelper.js';
|
|
@@ -23,6 +23,7 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
23
23
|
translations;
|
|
24
24
|
ignoreHelper;
|
|
25
25
|
isOutputEqualsToRepo;
|
|
26
|
+
packagedFlows = new Set();
|
|
26
27
|
constructor(work, metadata) {
|
|
27
28
|
super(work, metadata);
|
|
28
29
|
this.translations = new Map();
|
|
@@ -42,6 +43,13 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
42
43
|
}
|
|
43
44
|
async _buildFlowDefinitionsMap() {
|
|
44
45
|
this.translations.clear();
|
|
46
|
+
// Cache the package-flow set once per process() invocation — avoids
|
|
47
|
+
// re-computing the union-view of ChangeSet for every parsed flow.
|
|
48
|
+
// _shouldProcess() has already checked has(FLOW_XML_NAME), so get cannot
|
|
49
|
+
// return undefined here.
|
|
50
|
+
this.packagedFlows = this.work.changes
|
|
51
|
+
.forPackageManifest()
|
|
52
|
+
.get(FLOW_XML_NAME);
|
|
45
53
|
const pathspecs = this.config.source.map(s => `${s}/*${EXTENSION}${METAFILE_SUFFIX}`);
|
|
46
54
|
const translationPaths = await grepContent('flowDefinitions', pathspecs, this.work.config);
|
|
47
55
|
for (const translationPath of translationPaths) {
|
|
@@ -66,6 +74,7 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
66
74
|
target: ManifestTarget.Package,
|
|
67
75
|
type: TRANSLATION_TYPE,
|
|
68
76
|
member: getTranslationName(translationPath),
|
|
77
|
+
changeKind: ChangeKind.Modify,
|
|
69
78
|
});
|
|
70
79
|
if (this.config.generateDelta) {
|
|
71
80
|
const jsonTranslation = await this._getTranslationAsJSON(translationPath);
|
|
@@ -94,9 +103,8 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
94
103
|
}));
|
|
95
104
|
}
|
|
96
105
|
_addFlowPerTranslation({ translationPath, flowDefinition, }) {
|
|
97
|
-
const packagedElements = this.work.diffs.package.get(FLOW_XML_NAME);
|
|
98
106
|
const fullName = flowDefinition?.fullName;
|
|
99
|
-
if (fullName &&
|
|
107
|
+
if (fullName && this.packagedFlows.has(fullName)) {
|
|
100
108
|
if (!this.translations.has(translationPath)) {
|
|
101
109
|
this.translations.set(translationPath, []);
|
|
102
110
|
}
|
|
@@ -114,7 +122,7 @@ export default class FlowTranslationProcessor extends BaseProcessor {
|
|
|
114
122
|
return jsonTranslation;
|
|
115
123
|
}
|
|
116
124
|
_shouldProcess() {
|
|
117
|
-
return this.work.
|
|
125
|
+
return this.work.changes.forPackageManifest().has(FLOW_XML_NAME);
|
|
118
126
|
}
|
|
119
127
|
}
|
|
120
128
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EACL,aAAa,EACb,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EACL,iBAAiB,EACjB,WAAW,EACX,cAAc,GACf,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAE,iBAAiB,EAAgB,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,QAAQ,GACT,MAAM,uBAAuB,CAAA;AAC9B,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAA;AAgB7C,MAAM,kBAAkB,GAAG,CAAC,eAAuB,EAAE,EAAE,CACrD,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAErD,MAAM,qBAAqB,GAAG,GAAwB,EAAE,CAAC,CAAC;IACxD,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;IACrD,YAAY,EAAE;QACZ,SAAS,EAAE,yCAAyC;QACpD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,aAAa;IAC9C,YAAY,CAA+B;IACpD,YAAY,CAA0B;IACtC,oBAAoB,CAAqB;
|
|
1
|
+
{"version":3,"file":"flowTranslationProcessor.js","sourceRoot":"","sources":["../../src/post-processor/flowTranslationProcessor.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AACZ,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EACL,aAAa,EACb,UAAU,EACV,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,kCAAkC,CAAA;AAGzC,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,WAAW,EACX,cAAc,GACf,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAE,iBAAiB,EAAgB,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,QAAQ,GACT,MAAM,uBAAuB,CAAA;AAC9B,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAA;AAgB7C,MAAM,kBAAkB,GAAG,CAAC,eAAuB,EAAE,EAAE,CACrD,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAErD,MAAM,qBAAqB,GAAG,GAAwB,EAAE,CAAC,CAAC;IACxD,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;IACrD,YAAY,EAAE;QACZ,SAAS,EAAE,yCAAyC;QACpD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,aAAa;IAC9C,YAAY,CAA+B;IACpD,YAAY,CAA0B;IACtC,oBAAoB,CAAqB;IACzC,aAAa,GAAgB,IAAI,GAAG,EAAE,CAAA;IAEhD,YAAY,IAAU,EAAE,QAA4B;QAClD,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QACrB,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAA;IAC/B,CAAC;IAED,IAAa,WAAW;QACtB,OAAO,IAAI,CAAA;IACb,CAAC;IAGqB,AAAN,KAAK,CAAC,OAAO;QAC3B,uEAAuE;IACzE,CAAC;IAEe,KAAK,CAAC,mBAAmB;QACvC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC3B,OAAO,WAAW,EAAE,CAAA;QACtB,CAAC;QAED,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QACrC,OAAO,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAA;QACzB,oEAAoE;QACpE,kEAAkE;QAClE,yEAAyE;QACzE,yBAAyB;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO;aACnC,kBAAkB,EAAE;aACpB,GAAG,CAAC,aAAa,CAAE,CAAA;QAEtB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CACtC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,SAAS,GAAG,eAAe,EAAE,CAC5C,CAAA;QACD,MAAM,gBAAgB,GAAG,MAAM,WAAW,CACxC,iBAAiB,EACjB,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,MAAM,CACjB,CAAA;QAED,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;YAC/C,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAA;YACnD,CAAC;QACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,eAAuB;QAC/C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACxD,IAAI,CAAC,oBAAoB,GAAG,UAAU,CACpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CACjB,CAAA;QACH,CAAC;QACD,OAAO,CACL,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC;YACxD,CAAC,IAAI,CAAC,oBAAoB;gBACxB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAClD,CAAA;IACH,CAAC;IAES,KAAK,CAAC,wBAAwB;QACtC,MAAM,MAAM,GAAG,WAAW,EAAE,CAAA;QAE5B,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,cAAc,CAAC,OAAO;gBAC9B,IAAI,EAAE,gBAAgB;gBACtB,MAAM,EAAE,kBAAkB,CAAC,eAAe,CAAC;gBAC3C,UAAU,EAAE,UAAU,CAAC,MAAM;aAC9B,CAAC,CAAA;YACF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;gBAC9B,MAAM,eAAe,GACnB,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAA;gBACnD,IAAI,CAAC,qBAAqB,CACxB,eAAe,EACf,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAE,CACxC,CAAA;gBACD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,iBAAiB,CAAC,eAAe;oBACvC,IAAI,EAAE,eAAe;oBACrB,OAAO,EAAE,gBAAgB,CAAC,eAAe,CAAC;iBAC3C,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAES,qBAAqB,CAC7B,eAAoC,EACpC,oBAAsC;QAEtC,MAAM,eAAe,GAAG,SAAS,CAC/B,eAAe,CAAC,YAAY,EAAE,eAAe,CAC1B,CAAA;QACrB,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,eAAe,CAAC,GAAG,CAAC,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CACpE,CAAA;QACD,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,MAAM,CAC9D,CAAC,OAAuB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC/D,CAAA;QAED,eAAe,CAAC,YAAa,CAAC,eAAe,GAAG,eAAe,CAAC,MAAM,CACpE,4BAA4B,CAC7B,CAAA;IACH,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,eAAuB;QAC3D,MAAM,eAAe,GAAG,CAAC,MAAM,kBAAkB,CAC/C,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAC9C,IAAI,CAAC,MAAM,CACZ,CAAwB,CAAA;QACzB,MAAM,eAAe,GAAG,SAAS,CAC/B,eAAe,EAAE,YAAY,EAAE,eAAe,CAC3B,CAAA;QACrB,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CACvC,IAAI,CAAC,sBAAsB,CAAC;YAC1B,eAAe;YACf,cAAc;SACf,CAAC,CACH,CAAA;IACH,CAAC;IAES,sBAAsB,CAAC,EAC/B,eAAe,EACf,cAAc,GAIf;QACC,MAAM,QAAQ,GAAG,cAAc,EAAE,QAAQ,CAAA;QACzC,IAAI,QAAQ,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;YAC5C,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC9D,CAAC;IACH,CAAC;IAES,KAAK,CAAC,qBAAqB,CACnC,eAAuB;QAEvB,MAAM,6BAA6B,GAAG,IAAI,CACxC,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,eAAe,CAChB,CAAA;QACD,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,6BAA6B,CAAC,CAAA;QAExE,IAAI,eAAe,GAAwB,qBAAqB,EAAE,CAAA;QAClE,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,6BAA6B,CAAC,CAAA;YACpE,eAAe,GAAG,QAAQ,CAAC,cAAc,CAAwB,CAAA;QACnE,CAAC;QAED,OAAO,eAAe,CAAA;IACxB,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAClE,CAAC;CACF;AA1JuB;IADrB,GAAG;uDAGH"}
|
|
@@ -10,33 +10,22 @@ const PACKAGE_FILE_NAME = 'package';
|
|
|
10
10
|
const XML_FILE_EXTENSION = 'xml';
|
|
11
11
|
export default class PackageGenerator extends BaseProcessor {
|
|
12
12
|
async process() {
|
|
13
|
-
this._cleanPackages();
|
|
14
|
-
await this._buildPackages();
|
|
15
|
-
}
|
|
16
|
-
_cleanPackages() {
|
|
17
|
-
const additive = this.work.diffs[PACKAGE_FILE_NAME];
|
|
18
|
-
const destructive = this.work.diffs[DESTRUCTIVE_CHANGES_FILE_NAME];
|
|
19
|
-
for (const [type, members] of additive) {
|
|
20
|
-
if (destructive.has(type)) {
|
|
21
|
-
destructive.set(type, new Set([...destructive.get(type)].filter(element => !members.has(element))));
|
|
22
|
-
if (destructive.get(type).size === 0) {
|
|
23
|
-
destructive.delete(type);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
async _buildPackages() {
|
|
29
13
|
const pc = new PackageBuilder(this.config);
|
|
14
|
+
// ChangeSet.forDestructiveManifest() already cancels delete entries that
|
|
15
|
+
// have been re-added or re-modified in the same diff — no local cleanup
|
|
16
|
+
// needed here.
|
|
17
|
+
const destructiveManifest = this.work.changes.forDestructiveManifest();
|
|
18
|
+
const packageManifest = this.work.changes.forPackageManifest();
|
|
30
19
|
await Promise.all([
|
|
31
20
|
{
|
|
32
21
|
filename: `${DESTRUCTIVE_CHANGES_FILE_NAME}.${XML_FILE_EXTENSION}`,
|
|
33
22
|
folder: DESTRUCTIVE_CHANGES_FILE_NAME,
|
|
34
|
-
manifest:
|
|
23
|
+
manifest: destructiveManifest,
|
|
35
24
|
},
|
|
36
25
|
{
|
|
37
26
|
filename: `${PACKAGE_FILE_NAME}.${XML_FILE_EXTENSION}`,
|
|
38
27
|
folder: PACKAGE_FILE_NAME,
|
|
39
|
-
manifest:
|
|
28
|
+
manifest: packageManifest,
|
|
40
29
|
},
|
|
41
30
|
{
|
|
42
31
|
filename: `${PACKAGE_FILE_NAME}.${XML_FILE_EXTENSION}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageGenerator.js","sourceRoot":"","sources":["../../src/post-processor/packageGenerator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,6BAA6B,GAAG,oBAAoB,CAAA;AAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAA;AACnC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IAEnC,AAAN,KAAK,CAAC,OAAO;QAC3B,
|
|
1
|
+
{"version":3,"file":"packageGenerator.js","sourceRoot":"","sources":["../../src/post-processor/packageGenerator.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;AAEZ,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,cAAc,MAAM,2BAA2B,CAAA;AACtD,OAAO,aAAa,MAAM,oBAAoB,CAAA;AAE9C,MAAM,6BAA6B,GAAG,oBAAoB,CAAA;AAC1D,MAAM,iBAAiB,GAAG,SAAS,CAAA;AACnC,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,aAAa;IAEnC,AAAN,KAAK,CAAC,OAAO;QAC3B,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC1C,yEAAyE;QACzE,wEAAwE;QACxE,eAAe;QACf,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAA;QACtE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAA;QAC9D,MAAM,OAAO,CAAC,GAAG,CACf;YACE;gBACE,QAAQ,EAAE,GAAG,6BAA6B,IAAI,kBAAkB,EAAE;gBAClE,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,mBAAmB;aAC9B;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,iBAAiB;gBACzB,QAAQ,EAAE,eAAe;aAC1B;YACD;gBACE,QAAQ,EAAE,GAAG,iBAAiB,IAAI,kBAAkB,EAAE;gBACtD,MAAM,EAAE,6BAA6B;gBACrC,QAAQ,EAAE,IAAI,GAAG,EAAE;aACpB;SACF,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACT,OAAO,UAAU,CACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAChD,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,QAAQ,CAAW,CACvC,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF;AAhCuB;IADrB,GAAG;+CAgCH"}
|