Skip to content

Use composite keys for package storage to support multiple types #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fullstackjam merged 1 commit into from
Apr 30, 2026
Merged

Use composite keys for package storage to support multiple types #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 36 additions & 27 deletions src/lib/components/ConfigEditor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
let selectedPackages = $state(new Map<string, string>());
let packageDescs = $state(new Map<string, string>());

function pkgKey(name: string, type: string): string {
return `${type}:${name}`;
}

interface MacOSPref {
domain: string;
key: string;
Expand All @@ -63,11 +67,10 @@
let expandedPrefCats = $state<Set<string>>(new Set());

const packages = $derived(
Array.from(selectedPackages.entries()).map(([name, type]) => ({
name,
type,
desc: packageDescs.get(name) || '',
}))
Array.from(selectedPackages.entries()).map(([key, type]) => {
const name = key.slice(type.length + 1);
return { name, type, desc: packageDescs.get(key) || '' };
})
);

const sections = [
Expand Down Expand Up @@ -139,9 +142,9 @@
const p = PRESET_PACKAGES[preset];
if (!p) return;
const newMap = new Map<string, string>();
for (const pkg of p.cli) newMap.set(pkg, 'formula');
for (const pkg of p.cask) newMap.set(pkg, 'cask');
if (p.npm) for (const pkg of p.npm) newMap.set(pkg, 'npm');
for (const pkg of p.cli) newMap.set(pkgKey(pkg, 'formula'), 'formula');
for (const pkg of p.cask) newMap.set(pkgKey(pkg, 'cask'), 'cask');
if (p.npm) for (const pkg of p.npm) newMap.set(pkgKey(pkg, 'npm'), 'npm');
selectedPackages = newMap;
}

Expand All @@ -151,14 +154,15 @@
}

function togglePackage(name: string, type: string, desc: string = '') {
const key = pkgKey(name, type);
const newMap = new Map(selectedPackages);
const newDescs = new Map(packageDescs);
if (newMap.has(name)) {
newMap.delete(name);
newDescs.delete(name);
if (newMap.has(key)) {
newMap.delete(key);
newDescs.delete(key);
} else {
newMap.set(name, type);
if (desc) newDescs.set(name, desc);
newMap.set(key, type);
if (desc) newDescs.set(key, desc);
}
selectedPackages = newMap;
packageDescs = newDescs;
Expand Down Expand Up @@ -200,10 +204,12 @@
const descs = new Map<string, string>();
for (const pkg of data.packages) {
if (typeof pkg === 'string') {
map.set(pkg, 'formula');
map.set(pkgKey(pkg, 'formula'), 'formula');
} else {
map.set(pkg.name, pkg.type || 'formula');
if (pkg.desc) descs.set(pkg.name, pkg.desc);
const t = pkg.type || 'formula';
const k = pkgKey(pkg.name, t);
map.set(k, t);
if (pkg.desc) descs.set(k, pkg.desc);
}
}
selectedPackages = map;
Expand Down Expand Up @@ -265,10 +271,12 @@
const newDescs = new Map<string, string>();
for (const pkg of savedPkgs) {
if (typeof pkg === 'string') {
newMap.set(pkg, 'formula');
newMap.set(pkgKey(pkg, 'formula'), 'formula');
} else {
newMap.set(pkg.name, pkg.type || 'formula');
if (pkg.desc) newDescs.set(pkg.name, pkg.desc);
const t = pkg.type || 'formula';
const k = pkgKey(pkg.name, t);
newMap.set(k, t);
if (pkg.desc) newDescs.set(k, pkg.desc);
}
}
selectedPackages = newMap;
Expand All @@ -293,11 +301,10 @@
return {
...formData,
alias: formData.alias.trim() || null,
packages: Array.from(selectedPackages.entries()).map(([name, type]) => ({
name,
type,
desc: packageDescs.get(name) || '',
})),
packages: Array.from(selectedPackages.entries()).map(([key, type]) => {
const name = key.slice(type.length + 1);
return { name, type, desc: packageDescs.get(key) || '' };
}),
snapshot: updatedSnapshot,
};
}
Expand All @@ -316,10 +323,12 @@
const newDescs = new Map<string, string>();
for (const pkg of parsed.packages || []) {
if (typeof pkg === 'string') {
newMap.set(pkg, 'formula');
newMap.set(pkgKey(pkg, 'formula'), 'formula');
} else {
newMap.set(pkg.name, pkg.type || 'formula');
if (pkg.desc) newDescs.set(pkg.name, pkg.desc);
const t = pkg.type || 'formula';
const k = pkgKey(pkg.name, t);
newMap.set(k, t);
if (pkg.desc) newDescs.set(k, pkg.desc);
}
}
selectedPackages = newMap;
Expand Down
26 changes: 16 additions & 10 deletions src/lib/components/PackageManager.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
onPresetChange: (preset: string) => void;
} = $props();

function pkgKey(name: string, type: string): string {
return `${type}:${name}`;
}

let searchQuery = $state('');
let searchResults = $state<SearchResult[]>([]);
let searchLoading = $state(false);
Expand Down Expand Up @@ -89,11 +93,12 @@
const cli: string[] = [];
const npm: string[] = [];
const taps: string[] = [];
for (const [pkg, type] of selectedPackages) {
if (type === 'cask') apps.push(pkg);
else if (type === 'npm') npm.push(pkg);
else if (type === 'tap') taps.push(pkg);
else cli.push(pkg);
for (const [key, type] of selectedPackages) {
const name = key.slice(type.length + 1);
if (type === 'cask') apps.push(name);
else if (type === 'npm') npm.push(name);
else if (type === 'tap') taps.push(name);
else cli.push(name);
}
return { apps, cli, npm, taps };
});
Expand Down Expand Up @@ -128,8 +133,9 @@
}
const caskSet = new Set<string>(data.casks || []);
for (const pkg of data.packages) {
if (!selectedPackages.has(pkg)) {
togglePackage(pkg, caskSet.has(pkg) ? 'cask' : 'formula');
const type = caskSet.has(pkg) ? 'cask' : 'formula';
if (!selectedPackages.has(pkgKey(pkg, type))) {
togglePackage(pkg, type);
}
}
showImport = false;
Expand Down Expand Up @@ -185,14 +191,14 @@
<button
type="button"
class="result-item"
class:selected={selectedPackages.has(result.name)}
class:selected={selectedPackages.has(pkgKey(result.name, result.type))}
onclick={() => togglePackage(result.name, result.type, result.desc)}
>
<span
class="result-check"
class:checked={selectedPackages.has(result.name)}
class:checked={selectedPackages.has(pkgKey(result.name, result.type))}
>
{selectedPackages.has(result.name) ? '✓' : ''}
{selectedPackages.has(pkgKey(result.name, result.type)) ? '✓' : ''}
</span>
<div class="result-info">
<div class="result-top">
Expand Down
Loading