@ui5/task-adaptation 1.6.4-rc.2 → 1.6.4
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/CHANGELOG.md +6 -41
- package/README.md +5 -0
- package/dist/adapters/abapAdapter.d.ts +4 -2
- package/dist/adapters/abapAdapter.js +4 -2
- package/dist/adapters/commands/downloadAnnotationsCommand.d.ts +4 -2
- package/dist/adapters/commands/downloadAnnotationsCommand.js +6 -2
- package/dist/annotationManager.d.ts +17 -0
- package/dist/{annotations/abapAnnotationManager.js → annotationManager.js} +10 -12
- package/dist/annotations/serviceRequestor.d.ts +3 -3
- package/dist/annotations/serviceRequestor.js +4 -4
- package/dist/appVariantManager.js +5 -2
- package/dist/bundle.js +6 -6
- package/dist/index.js +6 -5
- package/dist/model/configuration.d.ts +0 -2
- package/dist/model/types.d.ts +1 -0
- package/dist/previewManager.d.ts +2 -2
- package/dist/previewManager.js +14 -8
- package/dist/processors/abapProcessor.d.ts +18 -0
- package/dist/processors/abapProcessor.js +43 -0
- package/dist/processors/cfProcessor.d.ts +14 -0
- package/dist/processors/cfProcessor.js +46 -0
- package/dist/processors/previewProcessor.d.ts +8 -0
- package/dist/processors/previewProcessor.js +11 -0
- package/dist/processors/processor.d.ts +10 -0
- package/dist/processors/processor.js +39 -0
- package/dist/repositories/{abapRepository.d.ts → abapRepoManager.d.ts} +3 -5
- package/dist/repositories/{abapRepository.js → abapRepoManager.js} +4 -17
- package/dist/repositories/html5RepoManager.d.ts +12 -0
- package/dist/repositories/{html5Repository.js → html5RepoManager.js} +27 -58
- package/dist/util/commonUtil.d.ts +0 -1
- package/dist/util/commonUtil.js +0 -3
- package/dist/util/filesUtil.d.ts +2 -0
- package/dist/util/filesUtil.js +7 -0
- package/dist/util/fsUtil.d.ts +0 -2
- package/dist/util/fsUtil.js +0 -34
- package/package.json +4 -7
- package/rollup/overrides/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewDataSource.js +157 -0
- package/dist/annotations/abapAnnotationManager.d.ts +0 -17
- package/dist/annotations/annotationManager.d.ts +0 -3
- package/dist/annotations/annotationManager.js +0 -2
- package/dist/annotations/localAnnotationManager.d.ts +0 -4
- package/dist/annotations/localAnnotationManager.js +0 -7
- package/dist/landscapeConfiguration.d.ts +0 -9
- package/dist/landscapeConfiguration.js +0 -65
- package/dist/repositories/html5Repository.d.ts +0 -18
- package/dist/repositories/localRepository.d.ts +0 -16
- package/dist/repositories/localRepository.js +0 -66
- package/dist/repositories/repository.d.ts +0 -8
- package/dist/repositories/repository.js +0 -2
- package/scripts/publish.ts +0 -256
- package/scripts/test-integration-prep.sh +0 -4
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { IConfiguration, IReuseLibInfo } from "./../model/types.js";
|
|
2
|
-
import IRepository from "./repository.js";
|
|
3
|
-
import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
|
|
4
|
-
export default class HTML5Repository implements IRepository {
|
|
5
|
-
private configuration;
|
|
6
|
-
constructor(configuration: IConfiguration);
|
|
7
|
-
getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
|
|
8
|
-
fetch(_repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;
|
|
9
|
-
fetchReuseLib(_libName: string, _cachebusterToken: string, lib: IReuseLibInfo): Promise<Map<string, string>>;
|
|
10
|
-
getMetadata(): Promise<any>;
|
|
11
|
-
private getHtml5RepoInfo;
|
|
12
|
-
private getHTML5Credentials;
|
|
13
|
-
private getToken;
|
|
14
|
-
private requestMetadata;
|
|
15
|
-
private getAppZipEntries;
|
|
16
|
-
private download;
|
|
17
|
-
downloadAnnotationFile(_uri: string): Promise<Map<string, string>>;
|
|
18
|
-
}
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
|
|
2
|
-
import { IConfiguration } from "../model/configuration.js";
|
|
3
|
-
import { IReuseLibInfo } from "../model/types.js";
|
|
4
|
-
import IRepository from "./repository.js";
|
|
5
|
-
export default class LocalRepository implements IRepository {
|
|
6
|
-
private configuration;
|
|
7
|
-
constructor(configuration: IConfiguration);
|
|
8
|
-
downloadAnnotationFile(_uri: string): Promise<Map<string, string>>;
|
|
9
|
-
getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
|
|
10
|
-
fetch(appId: string, cachebusterToken: string): Promise<Map<string, string>>;
|
|
11
|
-
fetchReuseLib(libName: string, cachebusterToken: string, _lib: IReuseLibInfo): Promise<Map<string, string>>;
|
|
12
|
-
private collectAppVariantIdHierarchyItems;
|
|
13
|
-
private getExistingManifestPath;
|
|
14
|
-
private readFilesInBaseAppDir;
|
|
15
|
-
private getLocalFilesDirectory;
|
|
16
|
-
}
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
import { getLogger } from "@ui5/logger";
|
|
2
|
-
import path from "node:path";
|
|
3
|
-
import fs from "node:fs/promises";
|
|
4
|
-
import FsUtil from "../util/fsUtil.js";
|
|
5
|
-
const log = getLogger("@ui5/task-adaptation::LocalRepository");
|
|
6
|
-
export default class LocalRepository {
|
|
7
|
-
configuration;
|
|
8
|
-
constructor(configuration) {
|
|
9
|
-
this.configuration = configuration;
|
|
10
|
-
}
|
|
11
|
-
async downloadAnnotationFile(_uri) {
|
|
12
|
-
log.verbose("Downloading annotation files is not supported in LocalRepository.");
|
|
13
|
-
return new Map();
|
|
14
|
-
}
|
|
15
|
-
async getAppVariantIdHierarchy(appId) {
|
|
16
|
-
const items = [];
|
|
17
|
-
await this.collectAppVariantIdHierarchyItems(appId, items);
|
|
18
|
-
return items;
|
|
19
|
-
}
|
|
20
|
-
fetch(appId, cachebusterToken) {
|
|
21
|
-
return this.readFilesInBaseAppDir(appId, cachebusterToken);
|
|
22
|
-
}
|
|
23
|
-
fetchReuseLib(libName, cachebusterToken, _lib) {
|
|
24
|
-
return this.readFilesInBaseAppDir(libName, cachebusterToken);
|
|
25
|
-
}
|
|
26
|
-
async collectAppVariantIdHierarchyItems(appId, items) {
|
|
27
|
-
const appDir = this.getLocalFilesDirectory(appId);
|
|
28
|
-
const filenames = [
|
|
29
|
-
["manifest.json"],
|
|
30
|
-
["manifest.appdescr_variant"],
|
|
31
|
-
["webapp", "manifest.json"],
|
|
32
|
-
["webapp", "manifest.appdescr_variant"],
|
|
33
|
-
];
|
|
34
|
-
const filepaths = filenames.map((filename) => path.join(appDir, ...filename));
|
|
35
|
-
const existingManifestPath = await this.getExistingManifestPath(filepaths);
|
|
36
|
-
items.push({
|
|
37
|
-
appVariantId: appId,
|
|
38
|
-
repoName: appId,
|
|
39
|
-
cachebusterToken: path.dirname(existingManifestPath)
|
|
40
|
-
});
|
|
41
|
-
if (existingManifestPath.endsWith("manifest.appdescr_variant")) {
|
|
42
|
-
const manifestContent = await fs.readFile(existingManifestPath, "utf-8");
|
|
43
|
-
const manifest = JSON.parse(manifestContent);
|
|
44
|
-
await this.collectAppVariantIdHierarchyItems(manifest.reference, items);
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
async getExistingManifestPath(filePaths) {
|
|
48
|
-
const existenceChecks = await Promise.all(filePaths.map((filePath) => FsUtil.exists(filePath)));
|
|
49
|
-
const existingIndex = existenceChecks.findIndex((exists) => exists);
|
|
50
|
-
if (existingIndex !== -1) {
|
|
51
|
-
return filePaths[existingIndex];
|
|
52
|
-
}
|
|
53
|
-
throw new Error(`None of the paths exist: '${filePaths.join("', '")}'.`);
|
|
54
|
-
}
|
|
55
|
-
readFilesInBaseAppDir(_appId, cachebusterToken) {
|
|
56
|
-
log.verbose(`Fetching base app files from local directory: ${cachebusterToken}`);
|
|
57
|
-
return FsUtil.readFilesRecursively(cachebusterToken);
|
|
58
|
-
}
|
|
59
|
-
getLocalFilesDirectory(appId) {
|
|
60
|
-
const baseDir = this.configuration.adpDir
|
|
61
|
-
? path.normalize(this.configuration.adpDir).replace(/\\/g, "/").replace(/\/+$/, "").split("/")
|
|
62
|
-
: [".."];
|
|
63
|
-
return path.join(process.cwd(), ...baseDir, appId);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
//# sourceMappingURL=localRepository.js.map
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
|
|
2
|
-
import { IReuseLibInfo } from "../model/types.js";
|
|
3
|
-
export default interface IRepository {
|
|
4
|
-
getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
|
|
5
|
-
fetch(repoName: string, cachebusterToken: string): Promise<Map<string, string>>;
|
|
6
|
-
fetchReuseLib(libName: string, cachebusterToken: string, lib: IReuseLibInfo): Promise<Map<string, string>>;
|
|
7
|
-
downloadAnnotationFile(uri: string): Promise<Map<string, string>>;
|
|
8
|
-
}
|
package/scripts/publish.ts
DELETED
|
@@ -1,256 +0,0 @@
|
|
|
1
|
-
import { promises as fs } from "fs";
|
|
2
|
-
import path from "path";
|
|
3
|
-
import yargs from "yargs";
|
|
4
|
-
import { hideBin } from "yargs/helpers";
|
|
5
|
-
import { Octokit } from "@octokit/rest";
|
|
6
|
-
import { retry } from "@octokit/plugin-retry";
|
|
7
|
-
|
|
8
|
-
const OctokitClass = Octokit.plugin(retry);
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* Recursively get all file paths in the workspace root, excluding:
|
|
13
|
-
* - test/lib/integration
|
|
14
|
-
* - test/fixtures
|
|
15
|
-
* - test/expected
|
|
16
|
-
* - test/lib/index.perf.ts
|
|
17
|
-
* Returns relative paths from the root.
|
|
18
|
-
*/
|
|
19
|
-
async function getAllRootFilesExceptTestExclusions(root: string): Promise<string[]> {
|
|
20
|
-
const excludeDirs = [
|
|
21
|
-
"test/lib/integration",
|
|
22
|
-
"test/fixtures",
|
|
23
|
-
"test/expected",
|
|
24
|
-
".git",
|
|
25
|
-
"coverage",
|
|
26
|
-
".DS_Store",
|
|
27
|
-
"node_modules",
|
|
28
|
-
".nyc_output",
|
|
29
|
-
"coverage",
|
|
30
|
-
"dist",
|
|
31
|
-
"dist-debug",
|
|
32
|
-
"dist.zip",
|
|
33
|
-
".env",
|
|
34
|
-
"test/resources/metadata/download"
|
|
35
|
-
];
|
|
36
|
-
const excludeFiles = [
|
|
37
|
-
"test/lib/index.perf.ts",
|
|
38
|
-
"scripts/test-integration-prep.sh",
|
|
39
|
-
"Jenkinsfile"
|
|
40
|
-
];
|
|
41
|
-
|
|
42
|
-
async function walk(dir: string): Promise<string[]> {
|
|
43
|
-
const dirents = await fs.readdir(dir, { withFileTypes: true });
|
|
44
|
-
const files: string[] = [];
|
|
45
|
-
for (const dirent of dirents) {
|
|
46
|
-
const relPath = path.relative(root, path.join(dir, dirent.name));
|
|
47
|
-
if (excludeDirs.some(ex => relPath === ex || relPath.startsWith(ex + path.sep))) {
|
|
48
|
-
continue;
|
|
49
|
-
}
|
|
50
|
-
if (excludeFiles.includes(relPath)) {
|
|
51
|
-
continue;
|
|
52
|
-
}
|
|
53
|
-
if (dirent.isDirectory()) {
|
|
54
|
-
files.push(...await walk(path.join(dir, dirent.name)));
|
|
55
|
-
} else {
|
|
56
|
-
files.push(relPath);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return files;
|
|
60
|
-
}
|
|
61
|
-
return walk(root);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
const FILES = await getAllRootFilesExceptTestExclusions(process.cwd());
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
interface PublishArgs {
|
|
68
|
-
p?: string;
|
|
69
|
-
dryRun?: boolean;
|
|
70
|
-
tag?: string;
|
|
71
|
-
branch?: string;
|
|
72
|
-
[key: string]: unknown;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
async function publish() {
|
|
76
|
-
const argv = yargs(hideBin(process.argv))
|
|
77
|
-
.option("p", {
|
|
78
|
-
type: "string",
|
|
79
|
-
description: "GitHub token (-p)",
|
|
80
|
-
alias: "p"
|
|
81
|
-
})
|
|
82
|
-
.option("dryRun", {
|
|
83
|
-
type: "boolean",
|
|
84
|
-
description: "Run without publishing",
|
|
85
|
-
default: false
|
|
86
|
-
})
|
|
87
|
-
.option("tag", {
|
|
88
|
-
type: "string",
|
|
89
|
-
description: "Publish with a specific tag"
|
|
90
|
-
})
|
|
91
|
-
.option("branch", {
|
|
92
|
-
type: "string",
|
|
93
|
-
description: "Branch to update (default: main)",
|
|
94
|
-
default: "main",
|
|
95
|
-
alias: "b"
|
|
96
|
-
})
|
|
97
|
-
.help()
|
|
98
|
-
.alias("h", "help")
|
|
99
|
-
.parseSync() as PublishArgs;
|
|
100
|
-
|
|
101
|
-
if (argv.dryRun) {
|
|
102
|
-
console.log("Dry run: no publishing will be performed.");
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
|
-
const auth = argv.p;
|
|
106
|
-
if (auth) {
|
|
107
|
-
const octokit = new OctokitClass({ auth });
|
|
108
|
-
const ORGANIZATION = "SAP";
|
|
109
|
-
const REPO = "ui5-task-adaptation";
|
|
110
|
-
await uploadToRepo(octokit, ORGANIZATION, REPO, argv.branch);
|
|
111
|
-
if (argv.tag) {
|
|
112
|
-
console.log(`Published with tag: ${argv.tag}`);
|
|
113
|
-
}
|
|
114
|
-
} else {
|
|
115
|
-
console.log("Github token is not provided.");
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
async function getLatestVersion(): Promise<string> {
|
|
121
|
-
const pkg = await fs.readFile(path.join(process.cwd(), "package.json"), { encoding: "utf-8" });
|
|
122
|
-
const pkgJson = JSON.parse(pkg);
|
|
123
|
-
return pkgJson.version;
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
async function uploadToRepo(
|
|
128
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
129
|
-
org: string,
|
|
130
|
-
repo: string,
|
|
131
|
-
branch: string = "main"
|
|
132
|
-
): Promise<void> {
|
|
133
|
-
const fileBlobs = await Promise.all(Object.values(FILES).map(file => toBlob(octokit, org, repo, path.join(process.cwd(), file))));
|
|
134
|
-
const currentCommit = await getCurrentCommit(octokit, org, repo, branch);
|
|
135
|
-
const newTree = await createNewTree(
|
|
136
|
-
octokit,
|
|
137
|
-
org,
|
|
138
|
-
repo,
|
|
139
|
-
fileBlobs,
|
|
140
|
-
FILES,
|
|
141
|
-
currentCommit.treeSha
|
|
142
|
-
);
|
|
143
|
-
const currentVersion = await getLatestVersion();
|
|
144
|
-
const commitMessage = `Release ${currentVersion}`;
|
|
145
|
-
const newCommit = await createNewCommit(
|
|
146
|
-
octokit,
|
|
147
|
-
org,
|
|
148
|
-
repo,
|
|
149
|
-
commitMessage,
|
|
150
|
-
newTree.sha,
|
|
151
|
-
currentCommit.commitSha
|
|
152
|
-
);
|
|
153
|
-
await setBranchToCommit(octokit, org, repo, branch, newCommit.sha);
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
async function getCurrentCommit(
|
|
158
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
159
|
-
org: string,
|
|
160
|
-
repo: string,
|
|
161
|
-
branch: string = "main"
|
|
162
|
-
): Promise<{ commitSha: string; treeSha: string }> {
|
|
163
|
-
const { data: refData } = await octokit.git.getRef({
|
|
164
|
-
owner: org,
|
|
165
|
-
repo,
|
|
166
|
-
ref: `heads/${branch}`,
|
|
167
|
-
});
|
|
168
|
-
const commitSha = refData.object.sha
|
|
169
|
-
const { data: commitData } = await octokit.git.getCommit({
|
|
170
|
-
owner: org,
|
|
171
|
-
repo,
|
|
172
|
-
commit_sha: commitSha,
|
|
173
|
-
});
|
|
174
|
-
return {
|
|
175
|
-
commitSha,
|
|
176
|
-
treeSha: commitData.tree.sha,
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
async function toBlob(
|
|
182
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
183
|
-
org: string,
|
|
184
|
-
repo: string,
|
|
185
|
-
filePath: string
|
|
186
|
-
): Promise<{ sha: string }> {
|
|
187
|
-
const content = await fs.readFile(filePath, { encoding: "utf8" });
|
|
188
|
-
const blobData = await octokit.git.createBlob({
|
|
189
|
-
owner: org,
|
|
190
|
-
repo,
|
|
191
|
-
content,
|
|
192
|
-
encoding: "utf-8",
|
|
193
|
-
})
|
|
194
|
-
return blobData.data;
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
async function createNewTree(
|
|
199
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
200
|
-
owner: string,
|
|
201
|
-
repo: string,
|
|
202
|
-
blobs: { sha: string }[],
|
|
203
|
-
paths: string[],
|
|
204
|
-
parentTreeSha: string
|
|
205
|
-
): Promise<any> {
|
|
206
|
-
const tree = blobs.map(({ sha }, i) => ({
|
|
207
|
-
path: paths[i],
|
|
208
|
-
mode: "100644" as const,
|
|
209
|
-
type: "blob" as const,
|
|
210
|
-
sha,
|
|
211
|
-
}));
|
|
212
|
-
const { data } = await octokit.git.createTree({
|
|
213
|
-
owner,
|
|
214
|
-
repo,
|
|
215
|
-
tree,
|
|
216
|
-
base_tree: parentTreeSha,
|
|
217
|
-
})
|
|
218
|
-
return data;
|
|
219
|
-
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
async function createNewCommit(
|
|
223
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
224
|
-
org: string,
|
|
225
|
-
repo: string,
|
|
226
|
-
message: string,
|
|
227
|
-
currentTreeSha: string,
|
|
228
|
-
currentCommitSha: string
|
|
229
|
-
): Promise<any> {
|
|
230
|
-
const commit = await octokit.git.createCommit({
|
|
231
|
-
owner: org,
|
|
232
|
-
repo,
|
|
233
|
-
message,
|
|
234
|
-
tree: currentTreeSha,
|
|
235
|
-
parents: [currentCommitSha],
|
|
236
|
-
});
|
|
237
|
-
return commit.data;
|
|
238
|
-
};
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
async function setBranchToCommit(
|
|
242
|
-
octokit: InstanceType<typeof OctokitClass>,
|
|
243
|
-
org: string,
|
|
244
|
-
repo: string,
|
|
245
|
-
branch: string = "main",
|
|
246
|
-
commitSha: string
|
|
247
|
-
): Promise<any> {
|
|
248
|
-
return octokit.git.updateRef({
|
|
249
|
-
owner: org,
|
|
250
|
-
repo,
|
|
251
|
-
ref: `heads/${branch}`,
|
|
252
|
-
sha: commitSha,
|
|
253
|
-
});
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
publish();
|