@liquidmetal-ai/drizzle 0.4.7 → 0.4.9

package/src/unsafe/framework.ts

@@ -2,6 +2,7 @@ import { exec } from 'node:child_process';
 import { lstat } from 'node:fs/promises';
 import { dirname, join, parse } from 'node:path';
 import { promisify } from 'node:util';
+import { readFile } from 'node:fs/promises';
 
 /**
  * The name of the framework package
@@ -15,8 +16,23 @@ interface NpmListDependency {
   dependencies?: Record<string, NpmListDependency>;
 }
 
-interface NpmListOutput {
-  dependencies: Record<string, NpmListDependency>;
+async function resolveWorkspaceLink(version: string, currentDir: string): Promise<string | null> {
+  if (!version.startsWith('link:')) {
+    return version;
+  }
+
+  const linkPath = version.substring(5); // Remove 'link:' prefix
+  const absolutePath = join(currentDir, linkPath);
+
+  try {
+    const packageJsonPath = join(absolutePath, 'package.json');
+    const packageJsonContent = await readFile(packageJsonPath, 'utf8');
+    const packageJson = JSON.parse(packageJsonContent);
+    return packageJson.version || null;
+  } catch (error) {
+    console.error(`Error reading version from linked package at ${absolutePath}:`, error);
+    return null;
+  }
 }
 
 function findDependencyVersion(
@@ -48,9 +64,15 @@ async function fileExists(path: string): Promise<boolean> {
 }
 
 async function detectPackageManager(dir: string): Promise<'npm' | 'yarn' | 'pnpm' | null> {
-  if (await fileExists(join(dir, 'package-lock.json'))) return 'npm';
-  if (await fileExists(join(dir, 'yarn.lock'))) return 'yarn';
-  if (await fileExists(join(dir, 'pnpm-lock.yaml'))) return 'pnpm';
+  let currentDir = dir;
+
+  while (currentDir !== parse(currentDir).root) {
+    if (await fileExists(join(currentDir, 'package-lock.json'))) return 'npm';
+    if (await fileExists(join(currentDir, 'yarn.lock'))) return 'yarn';
+    if (await fileExists(join(currentDir, 'pnpm-lock.yaml'))) return 'pnpm';
+
+    currentDir = dirname(currentDir);
+  }
 
   return null;
 }
@@ -58,6 +80,7 @@ async function detectPackageManager(dir: string): Promise<'npm' | 'yarn' | 'pnpm
 const getVersionFromCommand = async (
   packageName: string,
   packageManager: 'npm' | 'yarn' | 'pnpm',
+  currentDir: string,
 ): Promise<string | null> => {
   try {
     const command = {
@@ -66,19 +89,36 @@ const getVersionFromCommand = async (
       pnpm: `pnpm list ${packageName} --json`,
     }[packageManager];
 
-    const { stdout } = await execAsync(command);
+    const { stdout } = await execAsync(command, { cwd: currentDir });
+
     if (packageManager === 'yarn') {
       const lines = stdout.split('\n').filter((line) => line.trim());
       for (const line of lines) {
         const parsed = JSON.parse(line);
         if (parsed.data?.trees) {
           const match = parsed.data.trees.find((t: { name: string }) => t.name === packageName);
-          if (match) return match.version;
+          if (match) {
+            return await resolveWorkspaceLink(match.version, currentDir);
+          }
         }
       }
     } else {
-      const data = JSON.parse(stdout) as NpmListOutput;
-      return findDependencyVersion(data.dependencies, packageName);
+      const data = JSON.parse(stdout);
+
+      // Handle pnpm array format vs npm object format
+      let dependencies;
+      if (Array.isArray(data)) {
+        // pnpm format: array of objects
+        dependencies = data[0]?.dependencies;
+      } else {
+        // npm format: single object with dependencies
+        dependencies = data.dependencies;
+      }
+
+      const version = findDependencyVersion(dependencies, packageName);
+      if (version) {
+        return await resolveWorkspaceLink(version, currentDir);
+      }
     }
   } catch (error) {
     console.error(`Error executing ${packageManager} list command:`, error);
@@ -99,7 +139,7 @@ export async function getPackageVersion(packageName: string): Promise<string | n
     while (currentDir !== parse(currentDir).root) {
       const packageManager = await detectPackageManager(currentDir);
       if (packageManager) {
-        const version = await getVersionFromCommand(packageName, packageManager);
+        const version = await getVersionFromCommand(packageName, packageManager, currentDir);
         if (version) return version;
       }
       currentDir = dirname(currentDir);

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/codestore.test.ts","./src/codestore.ts","./src/logging.test.ts","./src/logging.ts","./src/mrn.test.ts","./src/mrn.ts","./src/ulid.test.ts","./src/ulid.ts","./src/appify/build.test.ts","./src/appify/build.ts","./src/appify/index.test.ts","./src/appify/index.ts","./src/appify/parse.test.ts","./src/appify/parse.ts","./src/appify/validate.test.ts","./src/appify/validate.ts","./src/liquidmetal/v1alpha1/agent_memory_name_pb.ts","./src/liquidmetal/v1alpha1/annotation_pb.ts","./src/liquidmetal/v1alpha1/bucket_name_pb.ts","./src/liquidmetal/v1alpha1/catalog_pb.ts","./src/liquidmetal/v1alpha1/object_pb.ts","./src/liquidmetal/v1alpha1/rainbow_auth_pb.ts","./src/liquidmetal/v1alpha1/raindrop_pb.ts","./src/liquidmetal/v1alpha1/search_agent_pb.ts","./src/raindrop/index.test.ts","./src/raindrop/index.ts","./src/unsafe/codestore.test.ts","./src/unsafe/codestore.ts","./src/unsafe/framework.test.ts","./src/unsafe/framework.ts"],"version":"5.8.2"}
+{"root":["./src/codestore.test.ts","./src/codestore.ts","./src/logging.test.ts","./src/logging.ts","./src/mrn.test.ts","./src/mrn.ts","./src/ulid.test.ts","./src/ulid.ts","./src/appify/build.test.ts","./src/appify/build.ts","./src/appify/index.test.ts","./src/appify/index.ts","./src/appify/parse.test.ts","./src/appify/parse.ts","./src/appify/validate.test.ts","./src/appify/validate.ts","./src/liquidmetal/v1alpha1/agent_memory_name_pb.ts","./src/liquidmetal/v1alpha1/annotation_pb.ts","./src/liquidmetal/v1alpha1/bucket_name_pb.ts","./src/liquidmetal/v1alpha1/catalog_pb.ts","./src/liquidmetal/v1alpha1/events_connect.ts","./src/liquidmetal/v1alpha1/events_pb.ts","./src/liquidmetal/v1alpha1/logging_pb.ts","./src/liquidmetal/v1alpha1/object_pb.ts","./src/liquidmetal/v1alpha1/rainbow_auth_pb.ts","./src/liquidmetal/v1alpha1/raindrop_pb.ts","./src/liquidmetal/v1alpha1/riverjack_pb.ts","./src/liquidmetal/v1alpha1/search_agent_pb.ts","./src/raindrop/index.test.ts","./src/raindrop/index.ts","./src/unsafe/codestore.test.ts","./src/unsafe/codestore.ts","./src/unsafe/framework.test.ts","./src/unsafe/framework.ts"],"version":"5.8.3"}