Merge pull request #3 from constructive-io/feat/find-workspace-root

fix: resolve LICENSE and FOOTER.md from workspace root instead of hardcoded ../../

Author: pyramation

packages/makage/src/commands/assets.ts

@@ -1,15 +1,39 @@
+import fs from 'node:fs/promises';
 import path from 'node:path';
 import { runCopy } from './copy';
 import { runReadmeFooter } from './readmeFooter';
+import { findWorkspaceRoot } from './workspace';
+
+async function resolveRootFile(root: string | null, filename: string): Promise<string | null> {
+  if (!root) return null;
+  const filePath = path.join(root, filename);
+  try {
+    await fs.access(filePath);
+    return filePath;
+  } catch {
+    return null;
+  }
+}
 
 export async function runAssets(_args: string[]) {
-  // assumes we are in the package dir, LICENSE lives two levels up
-  await runCopy(['../../LICENSE', 'package.json', 'dist', '--flat']);
-
-  // README + FOOTER -> dist/README.md
-  await runReadmeFooter([
-    '--source', 'README.md',
-    '--footer', '../../FOOTER.md',
-    '--dest', path.join('dist', 'README.md')
-  ]);
+  const root = await findWorkspaceRoot(process.cwd());
+  const licensePath = await resolveRootFile(root, 'LICENSE');
+  const footerPath = await resolveRootFile(root, 'FOOTER.md');
+
+  if (licensePath) {
+    await runCopy([licensePath, 'package.json', 'dist', '--flat']);
+  } else {
+    await runCopy(['package.json', 'dist', '--flat']);
+    console.log('[makage] no LICENSE found at workspace root, skipping');
+  }
+
+  if (footerPath) {
+    await runReadmeFooter([
+      '--source', 'README.md',
+      '--footer', footerPath,
+      '--dest', path.join('dist', 'README.md')
+    ]);
+  } else {
+    await runCopy(['README.md', 'dist', '--flat']);
+  }
 }

packages/makage/src/commands/copy.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { findRootFile } from './workspace';
 
 interface CopyOptions {
   flat: boolean;
@@ -152,20 +153,21 @@ function matchPattern(name: string, pattern: string): boolean {
 async function copyReadmeWithFooter(readmePath: string, target: string) {
   const readme = await fs.readFile(readmePath, 'utf8');
 
-  // Look for FOOTER.md in the monorepo root (../../FOOTER.md relative to current dir)
-  const footerPath = path.join('../../FOOTER.md');
+  const footerPath = await findRootFile('FOOTER.md', process.cwd());
 
   let footer: string | null = null;
-  try {
-    footer = await fs.readFile(footerPath, 'utf8');
-  } catch (err: any) {
-    if (err.code === 'ENOENT') {
-      console.log(`[makage] warning: ${footerPath} not found, copying README without footer`);
-    } else {
-      throw err;
+  if (footerPath) {
+    try {
+      footer = await fs.readFile(footerPath, 'utf8');
+    } catch (err: any) {
+      if (err.code !== 'ENOENT') throw err;
     }
   }
 
+  if (!footer) {
+    console.log('[makage] no FOOTER.md found at workspace root, copying README without footer');
+  }
+
   const combined = footer
     ? `${readme.trimEnd()}\n\n---\n\n${footer.trim()}\n`
     : readme;

packages/makage/src/commands/workspace.ts

@@ -0,0 +1,43 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const WORKSPACE_MARKERS = ['pnpm-workspace.yaml', 'lerna.json'];
+
+export async function findWorkspaceRoot(from: string): Promise<string | null> {
+  let dir = path.resolve(from);
+
+  while (true) {
+    for (const marker of WORKSPACE_MARKERS) {
+      try {
+        await fs.access(path.join(dir, marker));
+        return dir;
+      } catch {}
+    }
+
+    try {
+      const raw = await fs.readFile(path.join(dir, 'package.json'), 'utf8');
+      const pkg = JSON.parse(raw);
+      if (pkg.workspaces) return dir;
+    } catch {}
+
+    const parent = path.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
+export async function findRootFile(
+  filename: string,
+  from: string
+): Promise<string | null> {
+  const root = await findWorkspaceRoot(from);
+  if (!root) return null;
+
+  const filePath = path.join(root, filename);
+  try {
+    await fs.access(filePath);
+    return filePath;
+  } catch {
+    return null;
+  }
+}

packages/makage/src/index.ts

@@ -5,3 +5,4 @@ export { runAssets } from './commands/assets';
 export { runBuild } from './commands/build';
 export { runBuildTs } from './commands/buildTs';
 export { runUpdateWorkspace } from './commands/updateWorkspace';
+export { findWorkspaceRoot, findRootFile } from './commands/workspace';