balena-cli 23.2.15-build-update-compose-7-3-0-97bf26975807627a264274621ffcf8380aea838e-1 → 23.2.15-build-update-compose-tar-dependencies-132ab39d4a4a27c2766acc7a6aee1cedfbe13a2c-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "23.2.15-build-update-compose-7-3-0-97bf26975807627a264274621ffcf8380aea838e-1",
+  "version": "23.2.15-build-update-compose-tar-dependencies-132ab39d4a4a27c2766acc7a6aee1cedfbe13a2c-1",
   "description": "The official balena Command Line Interface",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",
@@ -176,7 +176,7 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@balena/compose": "^7.3.0",
+    "@balena/compose": "^7.2.1",
     "@balena/dockerignore": "^1.0.2",
     "@balena/env-parsing": "^1.1.8",
     "@balena/es-version": "^1.0.1",
@@ -243,8 +243,8 @@
     "stream-to-promise": "^2.2.0",
     "string-width": "^4.2.3",
     "strip-ansi-stream": "^1.0.0",
-    "tar-stream": "^2.1.3",
-    "tar-utils": "^3.0.3",
+    "tar-stream": "^3.1.7",
+    "tar-utils": "^3.1.1",
     "through2": "^2.0.3",
     "tmp": "^0.2.1",
     "typed-error": "^3.2.1",
@@ -262,6 +262,6 @@
     "balena-request": "14.0.6"
   },
   "versionist": {
-    "publishedAt": "2026-01-05T23:04:56.483Z"
+    "publishedAt": "2026-01-07T12:07:55.047Z"
   }
 }

package/src/commands/os/configure.ts

@@ -208,7 +208,7 @@ export default class OsConfigureCmd extends Command {
 			})) as DeviceWithDeviceType & {
 				belongs_to__application: BalenaSdk.PineDeferred;
 			};
-			deviceTypeSlug = device.is_of__device_type[0].slug!;
+			deviceTypeSlug = device.is_of__device_type[0].slug;
 		} else if (fleetSlugOrId != null) {
 			app = await getApplication(balena, fleetSlugOrId, {
 				$select: 'slug',
@@ -226,7 +226,7 @@ export default class OsConfigureCmd extends Command {
 
 		const deviceTypeManifest = await helpers.getManifest(
 			params.image,
-			deviceTypeSlug!,
+			deviceTypeSlug,
 		);
 
 		const { normalizeOsVersion } = await import('../../utils/normalization');
@@ -242,7 +242,7 @@ export default class OsConfigureCmd extends Command {
 		);
 		await validateSecureBootOptionAndWarn(
 			secureBoot,
-			deviceTypeSlug!,
+			deviceTypeSlug,
 			osVersion,
 		);
 
@@ -258,7 +258,7 @@ export default class OsConfigureCmd extends Command {
 					};
 		const answers: AugmentedAnswers = {
 			...baseAnswers,
-			deviceType: deviceTypeSlug!,
+			deviceType: deviceTypeSlug,
 			version: osVersion,
 			developmentMode: developmentMode,
 			secureBoot: secureBoot,

package/src/commands/release/list.ts

@@ -89,10 +89,10 @@ export default class ReleaseListCmd extends Command {
 				(r) => r.id,
 			);
 
-			const augmentedReleases = releases.map((release) => {
-				const extra = releasesWithExplicitReadFieldsById[release.id];
-				return typeof extra === 'object' ? { ...release, ...extra } : release;
-			});
+			const augmentedReleases = releases.map((release) => ({
+				...release,
+				...releasesWithExplicitReadFieldsById[release.id],
+			}));
 
 			await pipeline(
 				Readable.from(augmentedReleases),

package/src/utils/compose-types.d.ts

@@ -15,41 +15,37 @@
  * limitations under the License.
  */
 
-import type { BalenaModel } from 'balena-sdk';
-import type { Composition, ImageDescriptor } from '@balena/compose/dist/parse';
+import type * as compose from '@balena/compose';
 import type { Pack } from 'tar-stream';
+import type { BalenaModel } from 'balena-sdk';
 
 interface Image {
 	context: string;
 	tag: string;
 }
 
-interface ImageProperties {
-	dockerfile?: string;
-	projectType?: string;
-	size?: number;
-	startTime?: Date;
-	endTime?: Date;
-}
-
 export interface BuiltImage {
 	logs: string;
 	name: string;
-	props: ImageProperties;
+	props: {
+		dockerfile?: string;
+		projectType?: string;
+		size?: number;
+		startTime?: Date;
+		endTime?: Date;
+	};
 	serviceName: string;
 }
 
-type ServiceImage = Omit<
-	BalenaModel['image']['Read'],
-	'created_at' | 'is_a_build_of__service'
->;
-
 export interface TaggedImage {
 	localImage: import('dockerode').Image;
-	serviceImage: ServiceImage;
+	serviceImage: Omit<
+		BalenaModel['image']['Read'],
+		'created_at' | 'is_a_build_of__service'
+	>;
 	serviceName: string;
 	logs: string;
-	props: ImageProperties;
+	props: BuiltImage.props;
 	registry: string;
 	repo: string;
 }
@@ -79,12 +75,12 @@ export interface ComposeCliFlags {
 export interface ComposeProject {
 	path: string;
 	name: string;
-	composition: Composition;
-	descriptors: ImageDescriptor[];
+	composition: compose.parse.Composition;
+	descriptors: compose.parse.ImageDescriptor[];
 }
 
 export interface Release {
-	client: import('@balena/compose').release.Request['client'];
+	client: compose.release.Request['client'];
 	release: Pick<
 		BalenaModel['release']['Read'],
 		| 'id'
@@ -93,27 +89,18 @@ export interface Release {
 		| 'composition'
 		| 'source'
 		| 'is_final'
+		| 'contract'
 		| 'semver'
 		| 'start_timestamp'
 		| 'end_timestamp'
-	> & {
-		contract: Contract | null;
-	};
-	serviceImages: Dictionary<ServiceImage>;
+	>;
+	serviceImages: Dictionary<
+		Omit<BalenaModel['image']['Read'], 'created_at' | 'is_a_build_of__service'>
+	>;
 }
 
-// TODO: The balena contract model for release.contract is `{ [key: string]: JSON } | JSON[] | null`
-// which appears to be incorrect, as a contract is represented as `{ [key: string]: any }`
-// (more specifically, `{ type: string, [key: string]: any }`) when querying a release for its contract.
-// @balena/contrato also defines a ContractObject as the type below, see:
-// https://github.com/balena-io/contrato/blob/543e891249431aa98474e17fecc66617ab9ca8f3/lib/types.ts#L15-L17
-export type Contract = {
-	type: string;
-	[key: string]: any;
-};
-
 interface TarDirectoryOptions {
-	composition?: Composition;
+	composition?: compose.parse.Composition;
 	convertEol?: boolean;
 	multiDockerignore?: boolean;
 	preFinalizeCallback?: (pack: Pack) => void | Promise<void>;

package/src/utils/compose.ts

@@ -26,7 +26,6 @@ import type {
 	ComposeOpts,
 	ComposeProject,
 	Release,
-	Contract,
 	TaggedImage,
 } from './compose-types';
 import Logger = require('./logger');
@@ -129,7 +128,7 @@ export const createRelease = async function (
 	composition: Composition,
 	draft: boolean,
 	semver: string | undefined,
-	contract: Contract | undefined,
+	contract: import('@balena/compose').release.Request['contract'],
 	imgDescriptors: ImageDescriptor[],
 ): Promise<Release> {
 	const crypto = require('crypto') as typeof import('crypto');
@@ -157,7 +156,7 @@ export const createRelease = async function (
 		);
 
 	const { id: userId } = await sdk.auth.getUserInfo();
-	const { release, serviceImages } = await releaseMod.create({
+	const { release, serviceImages: $serviceImages } = await releaseMod.create({
 		client: pinejsClient,
 		user: userId,
 		application: appId,
@@ -166,20 +165,23 @@ export const createRelease = async function (
 		commit: crypto.pseudoRandomBytes(16).toString('hex').toLowerCase(),
 		semver,
 		is_final: !draft,
-		contract: contract ?? undefined,
+		contract,
 		imgDescriptors,
 	});
 
-	for (const serviceImage of Object.values(serviceImages)) {
-		if ('created_at' in serviceImage) {
-			// created_at is not an optional field in the SDK, but we need to delete it
-			serviceImage.created_at = undefined as any;
-		}
-		if ('is_a_build_of__service' in serviceImage) {
-			// is_a_build_of__service is not an optional field in the SDK, but we need to delete it
-			serviceImage.is_a_build_of__service = undefined as any;
-		}
-	}
+	const serviceImages = Object.fromEntries(
+		Object.entries($serviceImages).map(([key, serviceImage]) => {
+			if (
+				'created_at' in serviceImage ||
+				'is_a_build_of__service' in serviceImage
+			) {
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars -- omit the created_at, is_a_build_of__service props
+				const { created_at, is_a_build_of__service, ...si } = serviceImage;
+				return [key, si];
+			}
+			return [key, serviceImage];
+		}),
+	);
 
 	return {
 		client: pinejsClient,
@@ -194,7 +196,7 @@ export const createRelease = async function (
 			'semver',
 			'start_timestamp',
 			'end_timestamp',
-		]) as Release['release'],
+		]),
 		serviceImages,
 	};
 };

package/src/utils/compose_ts.ts

@@ -37,16 +37,14 @@ import type {
 	BuiltImage,
 	ComposeOpts,
 	ComposeProject,
+	Release,
 	TaggedImage,
 	TarDirectoryOptions,
-	Release,
-	Contract,
 } from './compose-types';
 import type { DeviceInfo } from './device/api';
 import { getBalenaSdk, getCliUx, stripIndent } from './lazy';
 import Logger = require('./logger');
 import { exists } from './which';
-import { pick } from './helpers';
 
 const allowedContractTypes = ['sw.application', 'sw.block'];
 
@@ -1332,13 +1330,13 @@ async function pushAndUpdateServiceImages(
 			serviceImage.image_size = `${imgInfo.Size}`;
 			serviceImage.content_hash = imgDigest;
 			serviceImage.build_log = logs;
-			serviceImage.dockerfile = props.dockerfile ?? null;
-			serviceImage.project_type = props.projectType ?? null;
+			serviceImage.dockerfile = props.dockerfile;
+			serviceImage.project_type = props.projectType;
 			if (props.startTime) {
-				serviceImage.start_timestamp = props.startTime.toISOString();
+				serviceImage.start_timestamp = props.startTime;
 			}
 			if (props.endTime) {
-				serviceImage.end_timestamp = props.endTime.toISOString();
+				serviceImage.end_timestamp = props.endTime;
 			}
 			serviceImage.push_timestamp = new Date().toISOString();
 			serviceImage.status = 'success';
@@ -1380,23 +1378,23 @@ async function pushServiceImages(
 			logger.logDebug(
 				`Saving image ${serviceImage.is_stored_at__image_location}`,
 			);
-			if (skipLogUpload) {
-				serviceImage.build_log = null;
-			}
 
 			// These are the only update-able image fields in bC atm, and passing
 			// the whole image object in v7+ would result the allowlist to reject the request.
-			const imagePayload = pick(serviceImage, [
+			const imagePayloadFields = [
 				'end_timestamp',
 				'project_type',
 				'error_message',
-				'build_log',
 				'push_timestamp',
 				'status',
 				'content_hash',
 				'dockerfile',
 				'image_size',
-			]);
+			];
+			if (!skipLogUpload) {
+				imagePayloadFields.push('build_log');
+			}
+			const imagePayload = _.pick(serviceImage, imagePayloadFields);
 
 			if (
 				typeof imagePayload.error_message === 'string' &&
@@ -1554,7 +1552,7 @@ export function createRunLoop(tick: (...args: any[]) => void) {
 
 async function getContractContent(
 	filePath: string,
-): Promise<Contract | undefined> {
+): Promise<import('@balena/compose').release.Request['contract']> {
 	let fileContentAsString;
 	try {
 		fileContentAsString = await fs.readFile(filePath, 'utf8');
@@ -1584,7 +1582,7 @@ async function getContractContent(
 	return asJson;
 }
 
-function isContract(obj: any): obj is Contract {
+function isContract(obj: any): obj is Dictionary<any> {
 	return obj?.type && allowedContractTypes.includes(obj.type);
 }