@c8y/websdk 1019.24.6 → 1020.0.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/dist/ng-add/index.js +43 -12
- package/dist/ng-add/index.js.map +1 -1
- package/dist/ng-add/load-esm.d.ts +13 -0
- package/dist/ng-add/load-esm.js +25 -0
- package/dist/ng-add/load-esm.js.map +1 -0
- package/package.json +5 -1
package/dist/ng-add/index.js
CHANGED
|
@@ -2,13 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
5
|
-
const
|
|
5
|
+
const load_esm_1 = require("./load-esm");
|
|
6
6
|
const helpers_1 = require("yargs/helpers");
|
|
7
|
-
const pacote = require("pacote");
|
|
8
7
|
const yargs = require("yargs");
|
|
9
8
|
const fs_extra_1 = require("fs-extra");
|
|
10
9
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
11
10
|
const path_1 = require("path");
|
|
11
|
+
const npmFetch = require("npm-registry-fetch");
|
|
12
|
+
const npmConfig = require("@npmcli/config");
|
|
13
|
+
const definitions_1 = require("@npmcli/config/lib/definitions");
|
|
12
14
|
/**
|
|
13
15
|
* This function adds a rule to the tree using the provided commandline options, predefined
|
|
14
16
|
* application options and module definitions.
|
|
@@ -21,7 +23,7 @@ function ngAdd(options) {
|
|
|
21
23
|
*/
|
|
22
24
|
return async (tree, context) => {
|
|
23
25
|
const argv = await yargs((0, helpers_1.hideBin)(process.argv)).argv;
|
|
24
|
-
const registry = argv.registry
|
|
26
|
+
const registry = argv.registry;
|
|
25
27
|
const { appName, selectedVersion } = await getApplicationNameAndVersion(options.application, registry);
|
|
26
28
|
triggerDevkitNgAdd(appName, selectedVersion, tree, context, options);
|
|
27
29
|
};
|
|
@@ -70,6 +72,11 @@ function triggerDevkitNgAdd(appName, selectedVersion, tree, context, options) {
|
|
|
70
72
|
name: appName,
|
|
71
73
|
version: selectedVersion,
|
|
72
74
|
type: dependencies_1.NodeDependencyType.Dev
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
name: '@c8y/devkit',
|
|
78
|
+
version: selectedVersion,
|
|
79
|
+
type: dependencies_1.NodeDependencyType.Dev
|
|
73
80
|
}
|
|
74
81
|
];
|
|
75
82
|
dependencies.forEach(dependency => (0, dependencies_1.addPackageJsonDependency)(tree, dependency));
|
|
@@ -83,6 +90,7 @@ function triggerDevkitNgAdd(appName, selectedVersion, tree, context, options) {
|
|
|
83
90
|
async function chooseProjectToScaffoldFrom() {
|
|
84
91
|
const pathToAppList = (0, path_1.join)(__dirname, '../app-list.json');
|
|
85
92
|
const choices = await (0, fs_extra_1.readJson)(pathToAppList);
|
|
93
|
+
const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
|
|
86
94
|
return inquirer
|
|
87
95
|
.prompt([
|
|
88
96
|
{
|
|
@@ -97,6 +105,7 @@ async function chooseProjectToScaffoldFrom() {
|
|
|
97
105
|
});
|
|
98
106
|
}
|
|
99
107
|
async function selectBaseVersion(shownVersions) {
|
|
108
|
+
const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
|
|
100
109
|
return inquirer
|
|
101
110
|
.prompt([
|
|
102
111
|
{
|
|
@@ -117,7 +126,8 @@ async function selectBaseVersion(shownVersions) {
|
|
|
117
126
|
return answers.base_version;
|
|
118
127
|
});
|
|
119
128
|
}
|
|
120
|
-
function otherVersionSelectedPrompt() {
|
|
129
|
+
async function otherVersionSelectedPrompt() {
|
|
130
|
+
const { default: inquirer } = await (0, load_esm_1.loadEsmModule)('inquirer');
|
|
121
131
|
return inquirer
|
|
122
132
|
.prompt([
|
|
123
133
|
{
|
|
@@ -130,14 +140,35 @@ function otherVersionSelectedPrompt() {
|
|
|
130
140
|
return input.version_choice;
|
|
131
141
|
});
|
|
132
142
|
}
|
|
133
|
-
function getAllRelevantVersions(appName, registry) {
|
|
143
|
+
async function getAllRelevantVersions(appName, registry) {
|
|
134
144
|
const versionLimit = 5;
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
145
|
+
let options = { registry };
|
|
146
|
+
// if registry was not explicitly specified we should use the npmConfig to get the registry
|
|
147
|
+
if (!registry) {
|
|
148
|
+
const config = new npmConfig({ definitions: definitions_1.definitions, npmPath: '', shorthands: definitions_1.shorthands, flatten: definitions_1.flatten });
|
|
149
|
+
await config.load();
|
|
150
|
+
options = {
|
|
151
|
+
// get settings from here
|
|
152
|
+
...config.flat,
|
|
153
|
+
// select the registry depending on the package we would like to install
|
|
154
|
+
spec: appName
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
const response = await npmFetch.json(`/${appName}`, options);
|
|
158
|
+
const distTags = response['dist-tags'];
|
|
159
|
+
const latestVersion = distTags?.latest;
|
|
160
|
+
const versions = response.versions;
|
|
161
|
+
let versionList = Object.keys(versions);
|
|
162
|
+
if (latestVersion && versionList.includes(latestVersion)) {
|
|
163
|
+
versionList = versionList.filter(version => version !== latestVersion);
|
|
164
|
+
}
|
|
165
|
+
if (versionList.length > versionLimit) {
|
|
166
|
+
versionList = versionList.slice(0, versionLimit);
|
|
167
|
+
}
|
|
168
|
+
versionList = [...versionList, 'other'];
|
|
169
|
+
if (!latestVersion) {
|
|
170
|
+
return versionList;
|
|
171
|
+
}
|
|
172
|
+
return [`${distTags.latest} (latest)`, ...versionList];
|
|
142
173
|
}
|
|
143
174
|
//# 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":";;;AACA,4DAA4F;AAC5F,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ng-add/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This uses a dynamic import to load a module which may be ESM.
|
|
3
|
+
* CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
|
|
4
|
+
* will currently, unconditionally downlevel dynamic import into a require call.
|
|
5
|
+
* require calls cannot load ESM code and will result in a runtime error. To workaround
|
|
6
|
+
* this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
|
|
7
|
+
* Once TypeScript provides support for keeping the dynamic import this workaround can
|
|
8
|
+
* be dropped.
|
|
9
|
+
*
|
|
10
|
+
* @param modulePath The path of the module to load.
|
|
11
|
+
* @returns A Promise that resolves to the dynamically imported module.
|
|
12
|
+
*/
|
|
13
|
+
export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.loadEsmModule = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Lazily compiled dynamic import loader function.
|
|
6
|
+
*/
|
|
7
|
+
let load;
|
|
8
|
+
/**
|
|
9
|
+
* This uses a dynamic import to load a module which may be ESM.
|
|
10
|
+
* CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
|
|
11
|
+
* will currently, unconditionally downlevel dynamic import into a require call.
|
|
12
|
+
* require calls cannot load ESM code and will result in a runtime error. To workaround
|
|
13
|
+
* this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
|
|
14
|
+
* Once TypeScript provides support for keeping the dynamic import this workaround can
|
|
15
|
+
* be dropped.
|
|
16
|
+
*
|
|
17
|
+
* @param modulePath The path of the module to load.
|
|
18
|
+
* @returns A Promise that resolves to the dynamically imported module.
|
|
19
|
+
*/
|
|
20
|
+
function loadEsmModule(modulePath) {
|
|
21
|
+
load ?? (load = new Function('modulePath', `return import(modulePath);`));
|
|
22
|
+
return load(modulePath);
|
|
23
|
+
}
|
|
24
|
+
exports.loadEsmModule = loadEsmModule;
|
|
25
|
+
//# sourceMappingURL=load-esm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"load-esm.js","sourceRoot":"","sources":["../../ng-add/load-esm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAI,IAA+D,CAAC;AAEpE;;;;;;;;;;;GAWG;AACH,SAAgB,aAAa,CAAI,UAAwB;IACvD,IAAI,KAAJ,IAAI,GAAK,IAAI,QAAQ,CAAC,YAAY,EAAE,4BAA4B,CAG/D,EAAC;IAEF,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;AAC1B,CAAC;AAPD,sCAOC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c8y/websdk",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "1020.0.4",
|
|
4
4
|
"description": "Allows to scaffold a Cumulocity IoT application with ng add @c8y/websdk",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"scripts": {
|
|
@@ -15,9 +15,13 @@
|
|
|
15
15
|
"dist/"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
+
"@npmcli/config": "^8.2.2",
|
|
19
|
+
"npm-registry-fetch": "^16.2.1",
|
|
18
20
|
"yargs": "17.7.2"
|
|
19
21
|
},
|
|
20
22
|
"devDependencies": {
|
|
23
|
+
"@types/npmcli__config": "^6.0.3",
|
|
24
|
+
"@types/npm-registry-fetch": "^8.0.7",
|
|
21
25
|
"mkdirp": "3.0.1",
|
|
22
26
|
"ts-node": "10.9.2"
|
|
23
27
|
},
|