@codedir/mimir-code 0.1.2 → 0.1.4

package/dist/cli.mjs

@@ -3906,6 +3906,19 @@ import { fileURLToPath } from "url";
 import { readFileSync, existsSync } from "fs";
 function locateWasmFile() {
   const wasmFileName = "sql-wasm.wasm";
+  const currentDir = dirname(fileURLToPath(import.meta.url));
+  const nodeModulesPaths = [
+    // Relative to the built module (dist/storage/Database.js)
+    join(currentDir, "..", "..", "node_modules", "sql.js", "dist", wasmFileName),
+    // Relative to current working directory (for local development)
+    join(process.cwd(), "node_modules", "sql.js", "dist", wasmFileName)
+  ];
+  for (const modulePath of nodeModulesPaths) {
+    if (existsSync(modulePath)) {
+      const buffer = readFileSync(modulePath);
+      return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+    }
+  }
   const executablePath = process.argv[0] || process.execPath;
   const binaryDir = dirname(executablePath);
   const resourcesPaths = [
@@ -3922,23 +3935,13 @@ function locateWasmFile() {
       return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
     }
   }
-  const currentDir = dirname(fileURLToPath(import.meta.url));
-  const nodeModulesPaths = [
-    join(currentDir, "..", "..", "node_modules", "sql.js", "dist", wasmFileName),
-    join(process.cwd(), "node_modules", "sql.js", "dist", wasmFileName)
-  ];
-  for (const modulePath of nodeModulesPaths) {
-    if (existsSync(modulePath)) {
-      const buffer = readFileSync(modulePath);
-      return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
-    }
-  }
   const diagnostics = [
+    `import.meta.url: ${import.meta.url}`,
+    `currentDir: ${currentDir}`,
     `process.argv[0]: ${process.argv[0]}`,
     `process.execPath: ${process.execPath}`,
     `executablePath: ${executablePath}`,
     `binaryDir: ${binaryDir}`,
-    `currentDir: ${currentDir}`,
     `process.cwd(): ${process.cwd()}`
   ];
   throw new Error(
@@ -3948,7 +3951,7 @@ Diagnostics:
 ${diagnostics.join("\n")}
 
 Tried:
-` + [...resourcesPaths, ...nodeModulesPaths].map((p) => `  - ${p}`).join("\n")
+` + [...nodeModulesPaths, ...resourcesPaths].map((p) => `  - ${p}`).join("\n")
   );
 }
 var DatabaseManager = class _DatabaseManager {
@@ -4415,6 +4418,7 @@ function closeDatabaseManager() {
 
 // src/core/MimirInitializer.ts
 import path6, { dirname as dirname2 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 var MimirInitializer = class {
   constructor(fs4, configLoader2) {
     this.fs = fs4;
@@ -4534,15 +4538,17 @@ checkpoints/
       "light-colorblind.json"
     ];
     try {
+      const currentDir = dirname2(fileURLToPath2(import.meta.url));
       const executablePath = process.argv[0] || process.execPath;
       const binaryDir = dirname2(executablePath);
       const possibleSourceDirs = [
-        path6.join(binaryDir, "resources", "themes"),
-        // Compiled binary: ~/.local/bin/resources/themes/
-        path6.join(binaryDir, "../cli/themes"),
+        // npm package: <package-root>/src/cli/themes/
+        path6.join(currentDir, "../../src/cli/themes"),
+        // From dist/core/ -> src/cli/themes
         // Development: dist/core/../cli/themes
-        path6.join(binaryDir, "../../src/cli/themes")
-        // Development: dist/core/../../src/cli/themes
+        path6.join(currentDir, "../cli/themes"),
+        // Compiled binary: ~/.local/bin/resources/themes/
+        path6.join(binaryDir, "resources", "themes")
       ];
       for (const themeFile of defaultThemes) {
         const destPath = path6.join(themesDir, themeFile);
@@ -4583,15 +4589,17 @@ checkpoints/
     const commandsDir = path6.join(mimirDir, "commands");
     const exampleCommands = ["update-docs.yml"];
     try {
+      const currentDir = dirname2(fileURLToPath2(import.meta.url));
       const executablePath = process.argv[0] || process.execPath;
       const binaryDir = dirname2(executablePath);
       const possibleSourceDirs = [
-        path6.join(binaryDir, "resources", "commands"),
-        // Compiled binary: ~/.local/bin/resources/commands/
-        path6.join(binaryDir, "../../scripts/templates/commands"),
+        // npm package: <package-root>/scripts/templates/commands/
+        path6.join(currentDir, "../../scripts/templates/commands"),
+        // From dist/core/ -> scripts/templates/commands
         // Development: dist/core/../../scripts/templates/commands
-        path6.join(binaryDir, "../../../scripts/templates/commands")
-        // Alternative dev path
+        path6.join(currentDir, "../../../scripts/templates/commands"),
+        // Compiled binary: ~/.local/bin/resources/commands/
+        path6.join(binaryDir, "resources", "commands")
       ];
       for (const commandFile of exampleCommands) {
         const destPath = path6.join(commandsDir, commandFile);