@nordicsemiconductor/pc-nrfconnect-shared 90.0.0 → 91.0.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/Changelog.md +26 -0
- package/config/jest.config.js +0 -1
- package/coverage/cobertura-coverage.xml +6 -81
- package/ipc/MetaFiles.ts +15 -7
- package/package.json +1 -4
- package/scripts/check-app-properties.ts +49 -22
- package/scripts/esbuild-renderer.js +0 -1
- package/scripts/nordic-publish.js +6 -6
- package/src/index.ts +0 -1
- package/src/utils/packageJson.ts +11 -1
- package/typings/generated/ipc/MetaFiles.d.ts +13 -7
- package/typings/generated/ipc/MetaFiles.d.ts.map +1 -1
- package/typings/generated/src/index.d.ts +0 -1
- package/typings/generated/src/index.d.ts.map +1 -1
- package/typings/generated/src/utils/packageJson.d.ts.map +1 -1
- package/mocks/deviceLibMock.ts +0 -21
- package/src/Device/deviceLibWrapper.test.ts +0 -97
- package/src/Device/deviceLibWrapper.ts +0 -66
- package/typings/generated/src/Device/deviceLibWrapper.d.ts +0 -6
- package/typings/generated/src/Device/deviceLibWrapper.d.ts.map +0 -1
- package/typings/generated/src/Device/deviceLibWrapper.test.d.ts +0 -2
- package/typings/generated/src/Device/deviceLibWrapper.test.d.ts.map +0 -1
package/src/index.ts
CHANGED
|
@@ -107,7 +107,6 @@ export {
|
|
|
107
107
|
} from './Device/deviceAutoSelectSlice';
|
|
108
108
|
export { clearWaitForDevice } from './Device/deviceLister';
|
|
109
109
|
export { deviceInfo } from './Device/deviceInfo/deviceInfo';
|
|
110
|
-
export { getDeviceLibContext } from './Device/deviceLibWrapper';
|
|
111
110
|
export { isDeviceInDFUBootloader } from './Device/sdfuOperations';
|
|
112
111
|
export {
|
|
113
112
|
default as sdfuOperations,
|
package/src/utils/packageJson.ts
CHANGED
|
@@ -40,5 +40,15 @@ export default () => {
|
|
|
40
40
|
- Or if the app was packaged without a package.json, but in that case the launcher should not even launch this app.`);
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
|
|
43
|
+
/* We need an intermediate, less safe typecast to `unknown`: TypeScript
|
|
44
|
+
assumes for the properties of NrfutilModules that they are string[] but
|
|
45
|
+
we type them as [string, ...string[]] in PackageJson. And TypeScript
|
|
46
|
+
considers these two types as not compatible. We hopefully can remove this
|
|
47
|
+
typecast when we check the format of package.json with zod.
|
|
48
|
+
|
|
49
|
+
Rationale for typing the properties as [string, ...string[]]: We require
|
|
50
|
+
that always at least one version is provided and also check this in
|
|
51
|
+
`check-app-properties.ts`)
|
|
52
|
+
*/
|
|
53
|
+
return packageJson as unknown as PackageJson;
|
|
44
54
|
};
|
|
@@ -10,7 +10,7 @@ export type AppVersions = {
|
|
|
10
10
|
export type AppVersion = {
|
|
11
11
|
shasum?: string;
|
|
12
12
|
tarballUrl: UrlString;
|
|
13
|
-
nrfutilModules?:
|
|
13
|
+
nrfutilModules?: NrfutilModules;
|
|
14
14
|
};
|
|
15
15
|
export interface AppInfo {
|
|
16
16
|
name: string;
|
|
@@ -29,16 +29,22 @@ export interface AppInfo {
|
|
|
29
29
|
interface ObjectContainingOptionalStrings {
|
|
30
30
|
[index: string]: string | undefined;
|
|
31
31
|
}
|
|
32
|
-
interface
|
|
33
|
-
nrfutil?:
|
|
32
|
+
interface NrfConnectForDesktop {
|
|
33
|
+
nrfutil?: NrfutilModules;
|
|
34
34
|
html?: string;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
type SemverString = string;
|
|
37
|
+
export type NrfutilModuleName = string;
|
|
38
|
+
export type NrfutilModuleVersion = SemverString;
|
|
39
|
+
export interface NrfutilModules {
|
|
40
|
+
[name: NrfutilModuleName]: [
|
|
41
|
+
NrfutilModuleVersion,
|
|
42
|
+
...NrfutilModuleVersion[]
|
|
43
|
+
];
|
|
38
44
|
}
|
|
39
45
|
export interface PackageJson {
|
|
40
46
|
name: string;
|
|
41
|
-
version:
|
|
47
|
+
version: SemverString;
|
|
42
48
|
author?: string;
|
|
43
49
|
bin?: ObjectContainingOptionalStrings | string;
|
|
44
50
|
dependencies?: ObjectContainingOptionalStrings;
|
|
@@ -47,7 +53,7 @@ export interface PackageJson {
|
|
|
47
53
|
devDependencies?: ObjectContainingOptionalStrings;
|
|
48
54
|
displayName?: string;
|
|
49
55
|
engines?: ObjectContainingOptionalStrings;
|
|
50
|
-
nrfConnectForDesktop?:
|
|
56
|
+
nrfConnectForDesktop?: NrfConnectForDesktop;
|
|
51
57
|
files?: readonly string[];
|
|
52
58
|
license?: string;
|
|
53
59
|
main?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,UAAU,+BAA+B;IACrC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,UAAU,oBAAoB;IAC1B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,
|
|
1
|
+
{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,UAAU,+BAA+B;IACrC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,UAAU,oBAAoB;IAC1B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACvC,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC3B,CAAC,IAAI,EAAE,iBAAiB,GAAG;QACvB,oBAAoB;QACpB,GAAG,oBAAoB,EAAE;KAC5B,CAAC;CACL;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,+BAA+B,GAAG,MAAM,CAAC;IAC/C,YAAY,CAAC,EAAE,+BAA+B,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,EAAE,+BAA+B,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,+BAA+B,CAAC;IAC1C,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,+BAA+B,CAAC;IACnD,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC7C"}
|
|
@@ -58,7 +58,6 @@ export { selectedDevice, getReadbackProtection, persistSerialPortOptions, type D
|
|
|
58
58
|
export { setWaitForDevice, getAutoReselect, getWaitingForDeviceTimeout, getWaitingToAutoReselect, getWaitForDevice, } from './Device/deviceAutoSelectSlice';
|
|
59
59
|
export { clearWaitForDevice } from './Device/deviceLister';
|
|
60
60
|
export { deviceInfo } from './Device/deviceInfo/deviceInfo';
|
|
61
|
-
export { getDeviceLibContext } from './Device/deviceLibWrapper';
|
|
62
61
|
export { isDeviceInDFUBootloader } from './Device/sdfuOperations';
|
|
63
62
|
export { default as sdfuOperations, switchToBootloaderMode, switchToApplicationMode, } from './Device/sdfuOperations';
|
|
64
63
|
export { defaultInitPacket, type DfuImage, FwType, HashType, } from './Device/initPacket';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageJson.d.ts","sourceRoot":"","sources":["../../../../src/utils/packageJson.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;;AAEvD,
|
|
1
|
+
{"version":3,"file":"packageJson.d.ts","sourceRoot":"","sources":["../../../../src/utils/packageJson.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;;AAEvD,wBAkBE"}
|
package/mocks/deviceLibMock.ts
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2021 Nordic Semiconductor ASA
|
|
3
|
-
*
|
|
4
|
-
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
export const createContext = jest.fn().mockReturnValue(1);
|
|
8
|
-
export const setTimeoutConfig = jest.fn();
|
|
9
|
-
export const startLogEvents = jest.fn();
|
|
10
|
-
export const stopLogEvents = jest.fn();
|
|
11
|
-
export const setLogLevel = jest.fn();
|
|
12
|
-
export const setLogPattern = jest.fn();
|
|
13
|
-
|
|
14
|
-
export default {
|
|
15
|
-
createContext,
|
|
16
|
-
setTimeoutConfig,
|
|
17
|
-
startLogEvents,
|
|
18
|
-
stopLogEvents,
|
|
19
|
-
setLogLevel,
|
|
20
|
-
setLogPattern,
|
|
21
|
-
};
|
|
@@ -1,97 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2015 Nordic Semiconductor ASA
|
|
3
|
-
*
|
|
4
|
-
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
import { getModuleVersion } from './deviceLibWrapper';
|
|
8
|
-
|
|
9
|
-
const exampleModuleVersions = [
|
|
10
|
-
{
|
|
11
|
-
name: 'nrfdl',
|
|
12
|
-
plugins: [
|
|
13
|
-
{
|
|
14
|
-
dependencies: [
|
|
15
|
-
{
|
|
16
|
-
dependencies: [
|
|
17
|
-
{
|
|
18
|
-
expectedVersion: {
|
|
19
|
-
version: 'JLink_V7.66a',
|
|
20
|
-
versionFormat: 'string' as const,
|
|
21
|
-
},
|
|
22
|
-
name: 'JlinkARM',
|
|
23
|
-
version: 'JLink_V7.66a',
|
|
24
|
-
versionFormat: 'string' as const,
|
|
25
|
-
},
|
|
26
|
-
],
|
|
27
|
-
name: 'jprog',
|
|
28
|
-
version: {
|
|
29
|
-
major: 10,
|
|
30
|
-
metadata: '0',
|
|
31
|
-
minor: 16,
|
|
32
|
-
patch: 0,
|
|
33
|
-
pre: '0',
|
|
34
|
-
},
|
|
35
|
-
versionFormat: 'semantic' as const,
|
|
36
|
-
},
|
|
37
|
-
],
|
|
38
|
-
name: 'jlink',
|
|
39
|
-
version: {
|
|
40
|
-
major: 0,
|
|
41
|
-
metadata: '0',
|
|
42
|
-
minor: 12,
|
|
43
|
-
patch: 5,
|
|
44
|
-
pre: '0',
|
|
45
|
-
},
|
|
46
|
-
versionFormat: 'semantic' as const,
|
|
47
|
-
},
|
|
48
|
-
],
|
|
49
|
-
version: {
|
|
50
|
-
major: 0,
|
|
51
|
-
metadata: '0',
|
|
52
|
-
minor: 12,
|
|
53
|
-
patch: 5,
|
|
54
|
-
pre: '0',
|
|
55
|
-
},
|
|
56
|
-
versionFormat: 'semantic' as const,
|
|
57
|
-
},
|
|
58
|
-
{
|
|
59
|
-
name: 'nrfdl-js',
|
|
60
|
-
version: {
|
|
61
|
-
major: 0,
|
|
62
|
-
minor: 4,
|
|
63
|
-
patch: 12,
|
|
64
|
-
metadata: '0',
|
|
65
|
-
pre: '0',
|
|
66
|
-
},
|
|
67
|
-
versionFormat: 'semantic' as const,
|
|
68
|
-
},
|
|
69
|
-
];
|
|
70
|
-
|
|
71
|
-
describe('finding module versions', () => {
|
|
72
|
-
test('in the top level modules', () => {
|
|
73
|
-
expect(getModuleVersion('nrfdl-js', exampleModuleVersions)).toEqual({
|
|
74
|
-
name: 'nrfdl-js',
|
|
75
|
-
version: {
|
|
76
|
-
major: 0,
|
|
77
|
-
minor: 4,
|
|
78
|
-
patch: 12,
|
|
79
|
-
metadata: '0',
|
|
80
|
-
pre: '0',
|
|
81
|
-
},
|
|
82
|
-
versionFormat: 'semantic' as const,
|
|
83
|
-
});
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
test('in nested dependencies', () => {
|
|
87
|
-
expect(getModuleVersion('JlinkARM', exampleModuleVersions)).toEqual({
|
|
88
|
-
expectedVersion: {
|
|
89
|
-
version: 'JLink_V7.66a',
|
|
90
|
-
versionFormat: 'string' as const,
|
|
91
|
-
},
|
|
92
|
-
name: 'JlinkARM',
|
|
93
|
-
version: 'JLink_V7.66a',
|
|
94
|
-
versionFormat: 'string' as const,
|
|
95
|
-
});
|
|
96
|
-
});
|
|
97
|
-
});
|
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2015 Nordic Semiconductor ASA
|
|
3
|
-
*
|
|
4
|
-
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
|
|
5
|
-
*/
|
|
6
|
-
|
|
7
|
-
import { app } from '@electron/remote';
|
|
8
|
-
import {
|
|
9
|
-
createContext,
|
|
10
|
-
ModuleVersion,
|
|
11
|
-
setTimeoutConfig,
|
|
12
|
-
} from '@nordicsemiconductor/nrf-device-lib-js';
|
|
13
|
-
import path from 'path';
|
|
14
|
-
|
|
15
|
-
let deviceLibContext = 0n;
|
|
16
|
-
export const getDeviceLibContext = () => {
|
|
17
|
-
if (deviceLibContext === 0n) initDeviceLib();
|
|
18
|
-
|
|
19
|
-
return deviceLibContext;
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
const initDeviceLib = () => {
|
|
23
|
-
if (process.platform === 'win32') {
|
|
24
|
-
const binariesPath = app.getAppPath().endsWith('app.asar')
|
|
25
|
-
? `${app.getAppPath()}.unpacked`
|
|
26
|
-
: app.getAppPath();
|
|
27
|
-
deviceLibContext = createContext({
|
|
28
|
-
plugins_dir: path.join(
|
|
29
|
-
binariesPath,
|
|
30
|
-
'node_modules',
|
|
31
|
-
'@nordicsemiconductor',
|
|
32
|
-
'nrf-device-lib-js',
|
|
33
|
-
'Release'
|
|
34
|
-
),
|
|
35
|
-
});
|
|
36
|
-
} else {
|
|
37
|
-
deviceLibContext = createContext();
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
setTimeoutConfig(getDeviceLibContext(), {
|
|
41
|
-
enumerateMs: 3 * 60 * 1000,
|
|
42
|
-
});
|
|
43
|
-
};
|
|
44
|
-
|
|
45
|
-
type KnownModule = 'nrfdl' | 'nrfdl-js' | 'jprog' | 'JlinkARM';
|
|
46
|
-
|
|
47
|
-
const findTopLevel = (module: KnownModule, versions: ModuleVersion[]) =>
|
|
48
|
-
versions.find(version => version.name === module);
|
|
49
|
-
|
|
50
|
-
const findInDependencies = (module: KnownModule, versions: ModuleVersion[]) => {
|
|
51
|
-
if (versions.length > 0) {
|
|
52
|
-
return getModuleVersion(
|
|
53
|
-
module,
|
|
54
|
-
versions.flatMap(version => [
|
|
55
|
-
...(version.dependencies ?? []),
|
|
56
|
-
...((version.plugins as ModuleVersion[]) ?? []),
|
|
57
|
-
])
|
|
58
|
-
);
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
|
|
62
|
-
export const getModuleVersion = (
|
|
63
|
-
module: KnownModule,
|
|
64
|
-
versions: ModuleVersion[] = []
|
|
65
|
-
): ModuleVersion | undefined =>
|
|
66
|
-
findTopLevel(module, versions) ?? findInDependencies(module, versions);
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { ModuleVersion } from '@nordicsemiconductor/nrf-device-lib-js';
|
|
2
|
-
export declare const getDeviceLibContext: () => bigint;
|
|
3
|
-
type KnownModule = 'nrfdl' | 'nrfdl-js' | 'jprog' | 'JlinkARM';
|
|
4
|
-
export declare const getModuleVersion: (module: KnownModule, versions?: ModuleVersion[]) => ModuleVersion | undefined;
|
|
5
|
-
export {};
|
|
6
|
-
//# sourceMappingURL=deviceLibWrapper.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"deviceLibWrapper.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLibWrapper.ts"],"names":[],"mappings":"AAOA,OAAO,EAEH,aAAa,EAEhB,MAAM,wCAAwC,CAAC;AAIhD,eAAO,MAAM,mBAAmB,cAI/B,CAAC;AAyBF,KAAK,WAAW,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,UAAU,CAAC;AAiB/D,eAAO,MAAM,gBAAgB,WACjB,WAAW,aACT,aAAa,EAAE,KAC1B,aAAa,GAAG,SACuD,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"deviceLibWrapper.test.d.ts","sourceRoot":"","sources":["../../../../src/Device/deviceLibWrapper.test.ts"],"names":[],"mappings":""}
|