@nordicsemiconductor/pc-nrfconnect-shared 190.0.0 → 191.0.0

package/nrfutil/moduleVersion.ts

@@ -6,26 +6,16 @@
 
 import { packageJsonApp } from '../src/utils/packageJson';
 import {
-    Dependency,
-    isIncrementalVersion,
-    isSemanticVersion,
-    isStringVersion,
-    SubDependency,
-    versionToString,
+    type Dependency,
+    hasVersion,
+    type TopLevelDependency,
 } from './sandboxTypes';
+import { versionToString } from './version';
 
-export const describeVersion = (version?: SubDependency | string) => {
-    if (typeof version === 'string') {
-        return version;
-    }
-
-    if (isSemanticVersion(version)) {
-        return `${version.version.major}.${version.version.minor}.${version.version.patch}`;
-    }
-
-    if (isIncrementalVersion(version) || isStringVersion(version)) {
-        return String(version.version);
-    }
+export const describeVersion = (dependencyOrVersion?: Dependency | string) => {
+    if (typeof dependencyOrVersion === 'string') return dependencyOrVersion;
+    if (hasVersion(dependencyOrVersion))
+        return versionToString(dependencyOrVersion);
 
     return 'Unknown';
 };
@@ -37,10 +27,10 @@ const findTopLevel = (module: KnownModule, dependencies: Dependency[]) =>
 
 const findInDependencies = (
     module: KnownModule,
-    dependencies: Dependency[]
+    dependencies: TopLevelDependency[]
 ) => {
     if (dependencies.length > 0) {
-        return resolveModuleVersion(
+        return findDependency(
             module,
             dependencies.flatMap(dependency => [
                 ...(dependency.dependencies ?? []),
@@ -53,16 +43,12 @@ const findInDependencies = (
 };
 
 export const getExpectedVersion = (dependency: Dependency) => {
-    const currentVersion = versionToString(
-        dependency.versionFormat,
-        dependency.version
-    );
+    if (!hasVersion(dependency)) return null;
+
+    const currentVersion = versionToString(dependency);
 
     const expectedVersion = dependency.expectedVersion
-        ? versionToString(
-              dependency.expectedVersion.versionFormat,
-              dependency.expectedVersion.version
-          )
+        ? versionToString(dependency.expectedVersion)
         : currentVersion;
 
     return {
@@ -71,10 +57,10 @@ export const getExpectedVersion = (dependency: Dependency) => {
     };
 };
 
-export const resolveModuleVersion = (
+export const findDependency = (
     module: KnownModule,
-    versions: Dependency[] = []
-): Dependency | SubDependency | undefined =>
+    versions: TopLevelDependency[] = []
+): Dependency | undefined =>
     findTopLevel(module, versions) ?? findInDependencies(module, versions);
 
 const overriddenVersion = (module: string) => {

package/nrfutil/modules.ts

@@ -79,12 +79,7 @@ const getModuleSandbox = (module: string) => {
 
     const createModuleSandbox = async () => {
         getNrfutilLogger()?.info(`Initialising the bundled nrfutil ${module}`);
-        promiseModuleSandbox = sandbox(
-            getUserDataDir(),
-            module,
-            undefined,
-            undefined
-        );
+        promiseModuleSandbox = sandbox(getUserDataDir(), module);
         moduleSandbox = await promiseModuleSandbox;
 
         logModuleVersions(module, moduleSandbox);

package/nrfutil/sandbox.ts

@@ -201,6 +201,7 @@ export class NrfutilSandbox {
                     force: true,
                 });
             }
+            await this.updateNrfUtilCore();
             await this.spawnNrfutil(
                 'install',
                 [`${this.module}=${this.version}`, '--force'],

package/nrfutil/sandboxTypes.ts

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
+import type { DiscriminatedVersion } from './version';
+
 export interface BackgroundTask<T> {
     onError: (error: Error, pid?: number) => void;
     onData: (data: T) => void;
@@ -126,80 +128,38 @@ export type LogMessage = {
     message: string;
 };
 
-export interface SemanticVersion {
-    major: number;
-    minor: number;
-    patch: number;
-    semverPreNumeric?: number;
-    semverPreAlphaNumeric?: number;
-    semverMetadataNumeric?: number;
-    semverMetadataAlphaNumeric?: number;
-}
-
-type VersionFormat = 'incremental' | 'semantic' | 'string';
-
-export type Plugin = {
-    dependencies: Dependency[];
+type Plugin = DiscriminatedVersion & {
+    dependencies: TopLevelDependency[];
     name: string;
-    versionFormat: VersionFormat;
-    version: VersionType;
 };
 
-export type Dependency = {
-    classification?: FeatureClassification;
+type DependencyWithoutVersion = {
     name: string;
-    plugins?: Plugin[];
-    dependencies?: SubDependency[];
-    versionFormat: VersionFormat;
-    version: VersionType;
-    expectedVersion?: {
-        versionFormat: VersionFormat;
-        version: VersionType;
-    };
+    description?: string;
+    dependencies?: Dependency[];
+    expectedVersion?: DiscriminatedVersion;
 };
+type DependencyWithVersion = DiscriminatedVersion & DependencyWithoutVersion;
 
-export type VersionType = SemanticVersion | string | number;
+export type Dependency = DependencyWithoutVersion | DependencyWithVersion;
 
-export interface SubDependency {
-    name: string;
-    description?: string;
-    dependencies?: SubDependency[];
-    versionFormat: VersionFormat;
-    version: VersionType;
-    expectedVersion?: { versionFormat: VersionFormat; version: VersionType };
-}
+export type TopLevelDependency = Dependency & {
+    classification?: FeatureClassification;
+    plugins?: Plugin[];
+};
 
 export type ModuleVersion = {
     build_timestamp: string;
     classification: FeatureClassification;
     commit_date: string;
     commit_hash: string;
-    dependencies: Dependency[];
+    dependencies: TopLevelDependency[];
     host: string;
     name: string;
     version: string;
 };
 
-export const isSemanticVersion = (
-    version?: SubDependency
-): version is SubDependency & { version: SemanticVersion } =>
-    version?.versionFormat === 'semantic';
-
-export const isIncrementalVersion = (
-    version?: SubDependency
-): version is SubDependency & { version: number } =>
-    version?.versionFormat === 'incremental';
-
-export const isStringVersion = (
-    version?: SubDependency
-): version is SubDependency & { version: string } =>
-    version?.versionFormat === 'string';
-
-export const versionToString = (type: VersionFormat, version: VersionType) => {
-    if (type === 'incremental' || type === 'string') {
-        return `${version}`;
-    }
-
-    const v = version as SemanticVersion;
-    return `${v.major}.${v.minor}.${v.patch}`;
-};
+export const hasVersion = (
+    dependency?: Dependency | DiscriminatedVersion
+): dependency is DependencyWithVersion | DiscriminatedVersion =>
+    dependency != null && 'version' in dependency && dependency.version != null;

package/nrfutil/version.ts

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+type IncrementalVersion = {
+    versionFormat: 'incremental';
+    version: number;
+};
+
+type SemanticVersion = {
+    versionFormat: 'semantic';
+    version: {
+        major: number;
+        minor: number;
+        patch: number;
+        semverPreNumeric?: number;
+        semverPreAlphaNumeric?: number;
+        semverMetadataNumeric?: number;
+        semverMetadataAlphaNumeric?: number;
+    };
+};
+
+type StringVersion = {
+    versionFormat: 'string';
+    version: string;
+};
+
+export type DiscriminatedVersion =
+    | IncrementalVersion
+    | SemanticVersion
+    | StringVersion;
+
+export const isSemanticVersion = (
+    version?: DiscriminatedVersion
+): version is SemanticVersion => version?.versionFormat === 'semantic';
+
+export const isIncrementalVersion = (
+    version?: DiscriminatedVersion
+): version is IncrementalVersion => version?.versionFormat === 'incremental';
+
+export const isStringVersion = (
+    version?: DiscriminatedVersion
+): version is StringVersion => version?.versionFormat === 'string';
+
+export const versionToString = (version: DiscriminatedVersion) => {
+    if (isSemanticVersion(version)) {
+        const semantic = version.version;
+        return `${semantic.major}.${semantic.minor}.${semantic.patch}`;
+    }
+
+    return String(version.version);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "190.0.0",
+    "version": "191.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",