Fix removing packages from Emscripten FS (#103)

* Fix mutating paths when packages are deleted, add spec property to empack_env_meta data type

* Fix removing packages

* Fix typos

* Fix types and logging

Author: AnastasiaSliusar

packages/mambajs-core/src/helper.ts

@@ -30,13 +30,14 @@ export interface IEmpackEnvMetaPkg {
   filename_stem: string;
   filename: string;
   url: string;
-  depends: [],
-  subdir: string
+  depends: [];
+  subdir: string;
 }
 
 export interface IEmpackEnvMeta {
   prefix: string;
   packages: IEmpackEnvMetaPkg[];
+  specs?: string[];
 }
 
 /**
@@ -203,7 +204,11 @@ export function saveFilesIntoEmscriptenFS(
   }
 }
 
-export function removeFilesFromEmscriptenFS(FS: any, paths: any): void {
+export function removeFilesFromEmscriptenFS(
+  FS: any,
+  paths: any,
+  logger?: ILogger
+): void {
   try {
     const pwd = FS.cwd();
     FS.chdir('/');
@@ -216,6 +221,8 @@ export function removeFilesFromEmscriptenFS(FS: any, paths: any): void {
         } else {
           FS.unlink(path);
         }
+      } else {
+        console.log(`Uninstall error: Path ${path} does not exist`);
       }
     });
     FS.chdir(pwd);

packages/mambajs-core/src/index.ts

@@ -241,15 +241,38 @@ export interface IRemovePackagesFromEnvOptions {
  */
 export const removePackagesFromEmscriptenFS = async (
   options: IRemovePackagesFromEnvOptions
-): Promise<void> => {
+): Promise<{ [key: string]: string }> => {
   const { removedPackages, Module, paths, logger } = options;
+  const newPath = { ...paths };
+
+  const removedPackagesMap: { [name: string]: string } = {};
+  Object.keys(removedPackages).forEach(filename => {
+    const removedPkg = removedPackages[filename];
+    const pkg = `${removedPkg.name}-${removedPkg.version}-${removedPkg.build_string}`;
+    removedPackagesMap[filename] = pkg;
+  });
+
   Object.keys(removedPackages).map(filename => {
     const pkg = removedPackages[filename];
     logger?.log(`Uninstalling ${pkg.name} ${pkg.version}`);
-    const packages = paths[filename];
-    removeFilesFromEmscriptenFS(Module.FS, packages);
-    delete paths[filename];
+    let packages = newPath[filename];
+    if (!packages) {
+      // file extensions can be different after resolving packages even though a package has the same name, build and version,
+      // so we need to check this and delete
+      const pkgData = removedPackagesMap[filename];
+      Object.keys(newPath).forEach((path: string) => {
+        if (path.includes(pkgData)) {
+          packages = newPath[path];
+        }
+      });
+    }
+    if (!packages) {
+      throw new Error(`There are no paths for ${filename}`);
+    }
+    removeFilesFromEmscriptenFS(Module.FS, packages, logger);
+    delete newPath[filename];
   });
+  return newPath;
 };
 
 export interface IBootstrapPythonOptions {

packages/mambajs/package.json

@@ -37,7 +37,7 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@conda-org/rattler": "^0.3.0",
+    "@conda-org/rattler": "^0.3.1",
     "@emscripten-forge/mambajs-core": "^0.13.0",
     "yaml": "^2.7.0"
   }

packages/mambajs/src/solverpip.ts

@@ -183,8 +183,9 @@ async function processRequirement(
     url: solved.url,
     repo_name: 'PyPi'
   };
-  installedWheels[requirement.package] = solved.name
-  installPipPackagesLookup[requirement.package] = pipSolvedPackages[solved.name]
+  installedWheels[requirement.package] = solved.name;
+  installPipPackagesLookup[requirement.package] =
+    pipSolvedPackages[solved.name];
 
   if (!pkgMetadata.info.requires_dist) {
     return;

yarn.lock

@@ -23,10 +23,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@conda-org/rattler@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@conda-org/rattler@npm:0.3.0"
-  checksum: 10c0/af9d03c8bc63694c654ea950df4f3e2044c1d2205e258e4e739a9c9971898a40e4fba627066a3e6683c2a3e7bc337b1c167932901845ddd9904a7417bf3c0e92
+"@conda-org/rattler@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@conda-org/rattler@npm:0.3.1"
+  checksum: 10c0/882dda8d0d420a61d19ac95d551469d3da8f7cf1ea59bcf08579d4bda42b0a00d6d64a1df0b898cfccef4b38123ca26b8088f8ec96298cec937fcff05a253376
   languageName: node
   linkType: hard
 
@@ -98,7 +98,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@emscripten-forge/mambajs@workspace:packages/mambajs"
   dependencies:
-    "@conda-org/rattler": "npm:^0.3.0"
+    "@conda-org/rattler": "npm:^0.3.1"
     "@emscripten-forge/mambajs-core": "npm:^0.13.0"
     "@esbuild-plugins/node-globals-polyfill": "npm:^0.2.3"
     "@esbuild-plugins/node-modules-polyfill": "npm:^0.2.2"