feat: version in distribution manifest (#11)

flybywiresim · Sep 8, 2024 · 589bd98 · 589bd98
1 parent 459c6e3
commit 589bd98
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/install/fragmenter-installer.test.ts b/src/install/fragmenter-installer.test.ts
@@ -51,10 +51,12 @@ describe('FragmenterInstaller', () => {
 
         installer.on('error', (e) => console.error(e));
 
-        setTimeout(() => {
+        const timeout = setTimeout(() => {
             abortController.abort();
         }, 3_000);
 
         await installer.install();
+
+        clearTimeout(timeout);
     });
 });
diff --git a/src/pack.test.ts b/src/pack.test.ts
@@ -2,24 +2,28 @@ import { pack } from './index';
 
 jest.setTimeout(720_000);
 
-test('Pack', async () => {
-    const result = await pack({
-        baseDir: './tests/in/pack-01',
-        outDir: './tests/out/pack-01',
-        modules: [{
-            name: 'a',
-            sourceDir: './a',
-        }, {
-            name: 'b',
-            sourceDir: './b',
-        }, {
-            name: 'c',
-            sourceDir: './c',
-        }],
-    });
+describe('packer', () => {
+    test('pack', async () => {
+        const result = await pack({
+            version: '0.1.0',
+            baseDir: './tests/in/pack-01',
+            outDir: './tests/out/pack-01',
+            modules: [{
+                name: 'a',
+                sourceDir: './a',
+            }, {
+                name: 'b',
+                sourceDir: './b',
+            }, {
+                name: 'c',
+                sourceDir: './c',
+            }],
+        });
 
-    expect(result.fullHash).toBe('7a8192768029ad9bd0aff064df12568aeea22573fe12eda88898687232e8cefdb759bf2cbd7795fa5840be1c6886025b86d621c76869df996a18260c535c761c');
-    expect(result.base.hash).toBe('c66ac1e5c010060c460d72ee94034f0fff3dffc9ef762502611876fcba444c9d7b5a761952a906175db7e96243b8d93651a0468d3e768709eb7895f36c35ad67');
-    expect(result.base.files).toEqual(['a.json', 'module.json']);
-    expect(result.modules).toHaveLength(3);
+        expect(result.version).toBe('0.1.0');
+        expect(result.fullHash).toBe('7a8192768029ad9bd0aff064df12568aeea22573fe12eda88898687232e8cefdb759bf2cbd7795fa5840be1c6886025b86d621c76869df996a18260c535c761c');
+        expect(result.base.hash).toBe('c66ac1e5c010060c460d72ee94034f0fff3dffc9ef762502611876fcba444c9d7b5a761952a906175db7e96243b8d93651a0468d3e768709eb7895f36c35ad67');
+        expect(result.base.files).toEqual(['a.json', 'module.json']);
+        expect(result.modules).toHaveLength(3);
+    });
 });
diff --git a/src/packer.ts b/src/packer.ts
@@ -2,9 +2,7 @@ import fs from 'fs-extra';
 import { Zip } from 'zip-lib';
 import SplitFile from 'split-file';
 import path from 'path';
-// eslint-disable-next-line import/no-unresolved
 import readRecurse from 'fs-readdir-recursive';
-// eslint-disable-next-line import/no-unresolved
 import hasha from 'hasha';
 import {
     BuildManifest,
@@ -174,6 +172,7 @@ export async function pack(buildManifest: BuildManifest): Promise<DistributionMa
         fs.copySync(buildManifest.baseDir, tempDir);
 
         const distributionManifest: DistributionManifest = {
+            version: buildManifest.version,
             modules: [],
             base: {
                 hash: '',

diff --git a/src/types.ts b/src/types.ts
@@ -9,13 +9,15 @@ export interface Base {
 }
 
 export interface BuildManifest {
+    version: string;
     baseDir: string;
     outDir: string;
     packOptions?: PackOptions;
     modules: Module[];
 }
 
 export interface DistributionManifest {
+    version?: string;
     modules: DistributionModule[];
     base: Base;
     fullHash: string;