feat(update): add auto updates of package.json

apps/update-sources/default.nix

@@ -2,6 +2,7 @@
   buildApp,
   callPackage,
   nodejs_latest,
+  prefetch-npm-deps,
   ...
 }:
 buildApp {
@@ -10,6 +11,7 @@ buildApp {
 
   runtimeInputs = [
     nodejs_latest
+    prefetch-npm-deps
     (callPackage ../../nixosModules/docker/updateImage.nix {})
   ];
 }

apps/update-sources/src/app.ts

@@ -20,88 +20,109 @@ if (!FLAKE) {
 
 const args = parseArgs();
 
-if (args['d'] || args['docker']) {
+const main = async() => {
-    console.log(updateDocker());
+    if (args['d'] || args['docker']) {
-}
+        console.log(updateDocker());
-
-if (args['i'] || args['inputs']) {
-    console.log(updateFlakeInputs());
-}
-
-if (args['f'] || args['firefox']) {
-    console.log(updateFirefoxAddons());
-}
-
-if (args['v'] || args['vuetorrent']) {
-    console.log(updateVuetorrent());
-}
-
-if (args['c'] || args['custom-sidebar']) {
-    console.log(updateCustomPackage('scopedPackages.x86_64-linux.lovelace-components.custom-sidebar'));
-}
-
-if (args['s'] || args['some-sass-language-server']) {
-    console.log(updateCustomPackage('some-sass-language-server'));
-}
-
-if (args['n'] || args['node_modules']) {
-    updateNodeModules();
-}
-
-if (args['a'] || args['all']) {
-    // Update this first because of nix run cmd
-    const firefoxOutput = updateFirefoxAddons();
-
-    console.log(firefoxOutput);
-
-
-    const flakeOutput = updateFlakeInputs();
-
-    console.log(flakeOutput);
-
-
-    const dockerOutput = updateDocker();
-
-    console.log(dockerOutput);
-
-
-    const vuetorrentOutput = updateVuetorrent();
-
-    console.log(vuetorrentOutput);
-
-    // This doesn't need to be added to commit msgs
-    console.log(updateCustomPackage('scopedPackages.x86_64-linux.lovelace-components.custom-sidebar'));
-    console.log(updateCustomPackage('some-sass-language-server'));
-
-
-    spawnSync('nixFastBuild', [], {
-        shell: true,
-        stdio: [process.stdin, process.stdout, process.stderr],
-    });
-
-    const output = [
-        'chore: update sources\n\n',
-    ];
-
-    if (flakeOutput.length > 5) {
-        output.push(`Flake Inputs:\n${flakeOutput}\n\n`);
-    }
-    if (dockerOutput.length > 5) {
-        output.push(`Docker Images:\n${dockerOutput}\n`);
-    }
-    if (firefoxOutput.length > 5) {
-        output.push(`Firefox Addons:\n${firefoxOutput}\n\n`);
-    }
-    if (vuetorrentOutput.length > 5) {
-        output.push(`Misc Sources:\n${vuetorrentOutput}\n`);
     }
 
-    if (args['f']) {
+    if (args['i'] || args['inputs']) {
-        writeFileSync(args['f'] as string, output.join(''));
+        console.log(updateFlakeInputs());
     }
-    else {
-        console.log(output.join(''));
-    }
-}
 
-spawnSync('alejandra', ['-q', FLAKE], { shell: true });
+    if (args['f'] || args['firefox']) {
+        console.log(updateFirefoxAddons());
+    }
+
+    if (args['v'] || args['vuetorrent']) {
+        console.log(updateVuetorrent());
+    }
+
+    if (args['c'] || args['custom-sidebar']) {
+        console.log(updateCustomPackage(
+            'scopedPackages.x86_64-linux.lovelace-components.custom-sidebar',
+        ));
+    }
+
+    if (args['s'] || args['some-sass-language-server']) {
+        console.log(updateCustomPackage('some-sass-language-server'));
+    }
+
+    if (args['n'] || args['node_modules']) {
+        console.log(await updateNodeModules());
+    }
+
+    if (args['a'] || args['all']) {
+        // Update this first because of nix run cmd
+        const firefoxOutput = updateFirefoxAddons();
+
+        console.log(firefoxOutput);
+
+
+        const flakeOutput = updateFlakeInputs();
+
+        console.log(flakeOutput);
+
+
+        const dockerOutput = updateDocker();
+
+        console.log(dockerOutput);
+
+
+        const nodeModulesOutput = await updateNodeModules();
+
+        console.log(nodeModulesOutput);
+
+
+        const vuetorrentOutput = updateVuetorrent();
+
+        console.log(vuetorrentOutput);
+
+
+        // This doesn't need to be added to commit msgs
+        console.log(updateCustomPackage(
+            'scopedPackages.x86_64-linux.lovelace-components.custom-sidebar',
+        ));
+        console.log(updateCustomPackage('some-sass-language-server'));
+
+
+        spawnSync('nixFastBuild', [], {
+            shell: true,
+            stdio: [process.stdin, process.stdout, process.stderr],
+        });
+
+        const indentOutput = (output: string): string => {
+            return `    ${output.split('\n').join('\n    ')}`;
+        };
+
+        const output = [
+            'chore: update sources\n\n',
+        ];
+
+        if (flakeOutput.length > 5) {
+            output.push(`Flake Inputs:\n${indentOutput(flakeOutput)}\n\n`);
+        }
+        if (dockerOutput.length > 5) {
+            output.push(`Docker Images:\n${indentOutput(dockerOutput)}\n`);
+        }
+        if (firefoxOutput.length > 5) {
+            output.push(`Firefox Addons:\n${indentOutput(firefoxOutput)}\n\n`);
+        }
+        if (nodeModulesOutput.length > 5) {
+            output.push(`Node modules:\n${indentOutput(nodeModulesOutput)}\n`);
+        }
+        if (vuetorrentOutput.length > 5) {
+            output.push(`Misc Sources:\n${indentOutput(vuetorrentOutput)}\n`);
+        }
+
+        if (args['f']) {
+            writeFileSync(args['f'] as string, output.join(''));
+        }
+        else {
+            console.log(output.join(''));
+        }
+    }
+
+    spawnSync('alejandra', ['-q', FLAKE], { shell: true });
+};
+
+main();

apps/update-sources/src/lib.ts

@@ -1,4 +1,5 @@
 import { spawnSync } from 'node:child_process';
+import { readFileSync, writeFileSync } from 'node:fs';
 
 
 export const parseArgs = () => {
@@ -28,3 +29,15 @@ export const parseFetchurl = (url: string) => JSON.parse(spawnSync(
     'nix', ['store', 'prefetch-file', '--refresh', '--json',
         '--hash-type', 'sha256', url, '--name', '"escaped"'], { shell: true },
 ).stdout.toString()).hash;
+
+export const replaceInFile = (replace: RegExp, replacement: string, file: string) => {
+    const fileContents = readFileSync(file);
+
+    const replaced = fileContents.toString().replace(replace, replacement);
+
+    writeFileSync(file, replaced);
+};
+
+export const npmRun = (args: string[], workspaceDir: string) => spawnSync(
+    'npm', args, { cwd: workspaceDir },
+).stdout.toString();

apps/update-sources/src/node-modules.ts

@@ -1,42 +1,77 @@
-import { readPackageJSON } from 'pkg-types';
+import { readPackageJSON, writePackageJSON } from 'pkg-types';
 import { readdirSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 
+import { replaceInFile, npmRun } from './lib';
+
 
 /* Constants */
 const FLAKE = process.env.FLAKE as string;
 
-export default () => {
-    readdirSync(FLAKE, { withFileTypes: true, recursive: true }).forEach(async(path) => {
-        if (path.name === 'package.json' && !path.parentPath.includes('node_modules')) {
-            const currentWorkspace = path.parentPath;
 
-            const currentPackageJson = await readPackageJSON(`${currentWorkspace}/package.json`);
+const updatePackageJson = async(workspaceDir: string, updates: object) => {
-            const outdated = JSON.parse(spawnSync(
+    const currentPackageJson = await readPackageJSON(`${workspaceDir}/package.json`);
-                'npm',
-                ['outdated', '--json'],
-                { cwd: currentWorkspace },
-            ).stdout.toString());
 
-            Object.keys(currentPackageJson.dependencies ?? {}).forEach((dep) => {
+    const outdated = JSON.parse(npmRun(['outdated', '--json'], workspaceDir));
-                const versions = outdated[dep];
 
-                if (!versions?.current) {
+    const updateDeps = (deps: string) => {
-                    return;
+        Object.keys(currentPackageJson[deps]).forEach((dep) => {
-                }
+            const versions = outdated[dep];
 
-                console.log(`${dep}: ${versions.current} -> ${versions.latest}`);
+            if (!versions?.current) {
-            });
+                return;
+            }
 
-            Object.keys(currentPackageJson.devDependencies ?? {}).forEach((dep) => {
+            if (!updates[dep]) {
-                const versions = outdated[dep];
+                updates[dep] = `${versions.current} -> ${versions.latest}`;
+            }
 
-                if (!versions?.current) {
+            currentPackageJson[deps][dep] = versions.latest;
-                    return;
+        });
-                }
+    };
 
-                console.log(`${dep}: ${versions.current} -> ${versions.latest}`);
+    if (currentPackageJson.dependencies) {
-            });
+        updateDeps('dependencies');
-        }
+    }
-    });
+
+    if (currentPackageJson.devDependencies) {
+        updateDeps('devDependencies');
+    }
+
+    await writePackageJSON(`${workspaceDir}/package.json`, currentPackageJson);
+};
+
+
+const prefetchNpmDeps = (workspaceDir: string): string => {
+    npmRun(['install', '--package-lock-only'], workspaceDir);
+
+    return spawnSync(
+        'prefetch-npm-deps',
+        [`${workspaceDir}/package-lock.json`],
+    ).stdout.toString().replace('\n', '');
+};
+
+
+export default async() => {
+    const updates = {};
+
+    const packages = readdirSync(FLAKE, { withFileTypes: true, recursive: true });
+
+    for (const path of packages) {
+        if (path.name === 'package.json' && !path.parentPath.includes('node_modules')) {
+            await updatePackageJson(path.parentPath, updates);
+
+            const hash = prefetchNpmDeps(path.parentPath);
+
+            replaceInFile(
+                /npmDepsHash = ".*";/,
+                `npmDepsHash = "${hash}";`,
+                `${path.parentPath}/default.nix`,
+            );
+        }
+    }
+
+    return Object.entries(updates)
+        .map(([key, dep]) => `${key}: ${dep}`)
+        .join('\n');
 };

nixosModules/ags/config/default.nix

@@ -0,0 +1,3 @@
+{
+  npmDepsHash = "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo=";
+}

nixosModules/ags/packages.nix

@@ -98,7 +98,7 @@ in {
         })
         // {
           "${cfg.configDir}/node_modules".source =
-            buildNodeModules ./config "sha256-XNvj59XfO6f+04PatCOZ93tkkZ1K7jReZPqLGJL2Ojo=";
+            buildNodeModules ./config (import ./config).npmDepsHash;
 
           "${cfg.configDir}/tsconfig.json".source = let
             inherit (ags.packages.${pkgs.system}) gjs;