@c8y/websdk 1022.4.7 → 1022.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ng-add/index.js +50 -18
- package/dist/ng-add/index.js.map +1 -1
- package/package.json +5 -3
package/dist/ng-add/index.js
CHANGED
|
@@ -11,6 +11,7 @@ const npmFetch = require("npm-registry-fetch");
|
|
|
11
11
|
const npmConfig = require("@npmcli/config");
|
|
12
12
|
const definitions_1 = require("@npmcli/config/lib/definitions");
|
|
13
13
|
const prompts_1 = require("@inquirer/prompts");
|
|
14
|
+
const semver_1 = require("semver");
|
|
14
15
|
/**
|
|
15
16
|
* This function adds a rule to the tree using the provided commandline options, predefined
|
|
16
17
|
* application options and module definitions.
|
|
@@ -97,20 +98,18 @@ async function chooseProjectToScaffoldFrom() {
|
|
|
97
98
|
});
|
|
98
99
|
return `@c8y/${selectedAppName}`;
|
|
99
100
|
}
|
|
100
|
-
async function selectBaseVersion(
|
|
101
|
+
async function selectBaseVersion(choices) {
|
|
101
102
|
let result = '';
|
|
102
|
-
const choices = shownVersions.map(version => ({ value: version }));
|
|
103
103
|
const answer = await (0, prompts_1.select)({
|
|
104
104
|
message: 'Which base version do you want to scaffold from?',
|
|
105
105
|
choices
|
|
106
106
|
});
|
|
107
|
-
if (answer
|
|
108
|
-
// Check if latest or next was selected and clean the string to include only the version.
|
|
109
|
-
result = answer.split(' (')[0];
|
|
110
|
-
}
|
|
111
|
-
else if (answer === 'other') {
|
|
107
|
+
if (answer === 'other') {
|
|
112
108
|
result = await otherVersionSelectedPrompt();
|
|
113
109
|
}
|
|
110
|
+
else {
|
|
111
|
+
result = answer;
|
|
112
|
+
}
|
|
114
113
|
return result;
|
|
115
114
|
}
|
|
116
115
|
async function otherVersionSelectedPrompt() {
|
|
@@ -135,19 +134,52 @@ async function getAllRelevantVersions(appName, registry) {
|
|
|
135
134
|
}
|
|
136
135
|
const response = await npmFetch.json(`/${appName}`, options);
|
|
137
136
|
const distTags = response['dist-tags'];
|
|
138
|
-
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
137
|
+
// get all tags per version, since multiple tags can point to the same version
|
|
138
|
+
const tagsPerVersion = Object.entries(distTags).reduceRight((acc, currentValue) => {
|
|
139
|
+
const [tag, version] = currentValue;
|
|
140
|
+
if (!acc[version]) {
|
|
141
|
+
acc[version] = [];
|
|
142
|
+
}
|
|
143
|
+
acc[version].push(tag);
|
|
144
|
+
return acc;
|
|
145
|
+
}, {});
|
|
146
|
+
// get rid of next tag, we don't want customers to use it.
|
|
147
|
+
for (const version of Object.keys(tagsPerVersion)) {
|
|
148
|
+
const tags = tagsPerVersion[version];
|
|
149
|
+
if (tags.includes('next') && tags.length === 1) {
|
|
150
|
+
// remove versions that are only tagged with 'next'
|
|
151
|
+
delete tagsPerVersion[version];
|
|
152
|
+
}
|
|
143
153
|
}
|
|
144
|
-
|
|
145
|
-
|
|
154
|
+
const alreadyListedVersionsSortedDescending = (0, semver_1.sort)(Object.keys(tagsPerVersion)).reverse();
|
|
155
|
+
const versionsFromDistTags = alreadyListedVersionsSortedDescending.map(version => {
|
|
156
|
+
const tags = tagsPerVersion[version];
|
|
157
|
+
return {
|
|
158
|
+
name: `${version} (${tags.join(', ')})`,
|
|
159
|
+
value: version
|
|
160
|
+
};
|
|
161
|
+
});
|
|
162
|
+
const highestVersionWithDistTag = alreadyListedVersionsSortedDescending[0];
|
|
163
|
+
const furtherVersions = versionLimit - versionsFromDistTags.length;
|
|
164
|
+
// if we already have enough versions listed, we do not need to process any more
|
|
165
|
+
if (furtherVersions <= 0) {
|
|
166
|
+
return versionsFromDistTags;
|
|
146
167
|
}
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
168
|
+
const versions = response.versions;
|
|
169
|
+
// list of versions that are not already listed in the dist-tags
|
|
170
|
+
// and are lower than the highest version with a dist-tag
|
|
171
|
+
// we sort them descending, so that the latest versions are at the top
|
|
172
|
+
let versionList = (0, semver_1.sort)(Object.keys(versions).filter(version => !alreadyListedVersionsSortedDescending.includes(version) &&
|
|
173
|
+
(0, semver_1.lt)(version, highestVersionWithDistTag))).reverse();
|
|
174
|
+
// if we have more versions than we want to show, we slice the list
|
|
175
|
+
// to the maximum number of versions we want to show
|
|
176
|
+
if (versionList.length > furtherVersions) {
|
|
177
|
+
versionList = versionList.slice(0, Math.min(versionList.length, furtherVersions));
|
|
150
178
|
}
|
|
151
|
-
|
|
179
|
+
versionList = [...versionList, 'other'];
|
|
180
|
+
return [
|
|
181
|
+
...versionsFromDistTags,
|
|
182
|
+
...versionList.map(version => ({ name: version, value: version }))
|
|
183
|
+
];
|
|
152
184
|
}
|
|
153
185
|
//# sourceMappingURL=index.js.map
|
package/dist/ng-add/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ng-add/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ng-add/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/websdk",
|
|
3
|
-
"version": "1022.4.
|
|
3
|
+
"version": "1022.4.9",
|
|
4
4
|
"description": "Allows to scaffold a Cumulocity IoT application with ng add @c8y/websdk",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"scripts": {
|
|
@@ -18,13 +18,15 @@
|
|
|
18
18
|
"yargs": "17.7.2",
|
|
19
19
|
"@inquirer/prompts": "7.3.1",
|
|
20
20
|
"@npmcli/config": "^10.3.0",
|
|
21
|
-
"npm-registry-fetch": "^18.0.2"
|
|
21
|
+
"npm-registry-fetch": "^18.0.2",
|
|
22
|
+
"semver": "~7.7.1"
|
|
22
23
|
},
|
|
23
24
|
"devDependencies": {
|
|
24
25
|
"@types/npmcli__config": "^6.0.3",
|
|
25
26
|
"@types/npm-registry-fetch": "^8.0.7",
|
|
27
|
+
"@types/semver": "^7.5.7",
|
|
26
28
|
"mkdirp": "3.0.1",
|
|
27
29
|
"ts-node": "10.9.2"
|
|
28
30
|
},
|
|
29
|
-
"author": ""
|
|
31
|
+
"author": "Cumulocity"
|
|
30
32
|
}
|