Merge pull request #109 from Araxeus/replace-@ltd/j-toml-with-smol-toml

Author: Araxeus

bun.lockb

@@ -150,13 +150,11 @@ export async function uninstall(
         }
     } else if (lockfile?.[name]) {
         // if not, remove the dependency from the lockfile
-        // @ts-expect-error Type 'undefined' is not assignable to type 'VendorLock'
-        lockfile[name] = undefined;
+        delete lockfile[name];
         await fs.writeFile(lockfilePath, JSON.stringify(lockfile, null, 2));
     }
 
-    // @ts-expect-error Type 'undefined' is not assignable to type 'VendorDependency'
-    configFile.vendorDependencies[name] = undefined;
+    delete configFile.vendorDependencies[name];
 
     await writeConfig({
         configFile,

lib/commands.ts

@@ -1,10 +1,9 @@
 import { existsSync } from 'node:fs';
 import { readFile, realpath, writeFile } from 'node:fs/promises';
-import { EOL } from 'node:os';
 import path from 'node:path';
-import toml, { Section } from '@ltd/j-toml';
 import detectIndent from 'detect-indent';
 import parseJson from 'parse-json';
+import toml from 'smol-toml';
 import yaml from 'yaml';
 import type {
     ConfigFile,
@@ -64,9 +63,7 @@ async function getConfigFile(folderPath: string): Promise<
         let data: ConfigFile;
         let format: 'toml' | 'yml' | 'json';
         if (config.path.endsWith('.toml')) {
-            data = toml.parse(config.data, {
-                joiner: EOL,
-            }) as ConfigFile;
+            data = toml.parse(config.data) as ConfigFile;
             format = 'toml';
         } else if (
             config.path.endsWith('.yml') ||
@@ -158,21 +155,7 @@ export async function writeConfig({
 }) {
     const indent = configFileSettings.indent;
     const stringify = {
-        toml: (configFile: ConfigFile) => {
-            for (const key of Object.keys(configFile.vendorDependencies)) {
-                if (configFile.vendorDependencies[key]) {
-                    configFile.vendorDependencies[key] = Section(
-                        configFile.vendorDependencies[key],
-                    );
-                }
-            }
-            // @ts-expect-error toml doesn't understand that the ConfigFile type is just an object
-            return toml.stringify(configFile, {
-                newline: EOL,
-                indent,
-                newlineAround: 'section',
-            });
-        },
+        toml: (configFile: ConfigFile) => toml.stringify(configFile),
         yml: (configFile: ConfigFile) =>
             yaml.stringify(configFile, {
                 indent: typeof indent === 'number' ? indent : indent?.length,

lib/config.ts

@@ -39,7 +39,6 @@
   },
   "dependencies": {
     "@commander-js/extra-typings": "^14.0.0",
-    "@ltd/j-toml": "^1.38.0",
     "@octokit/auth-oauth-device": "^8.0.3",
     "@octokit/rest": "^22.0.1",
     "commander": "^14.0.2",
@@ -49,6 +48,7 @@
     "make-fetch-happen": "^15.0.3",
     "open": "^11.0.0",
     "parse-json": "^8.3.0",
+    "smol-toml": "^1.5.2",
     "unarchive": "^1.1.4",
     "yaml": "^2.8.1"
   },