@travetto/manifest 3.0.0-rc.10 → 3.0.0-rc.12

package/bin/context.js

@@ -101,6 +101,8 @@ export async function getManifestContext(folder) {
 
   const moduleType = (await $getPkg(workspacePath)).type ?? 'commonjs';
   const mainFolder = mainPath === workspacePath ? '' : mainPath.replace(`${workspacePath}/`, '');
+  /** @type {'yarn'|'npm'} */
+  const packageManager = await fs.stat(path.resolve(workspacePath, 'yarn.lock')).then(() => 'yarn', () => 'npm');
 
   const res = {
     moduleType,
@@ -110,7 +112,8 @@ export async function getManifestContext(folder) {
     monoRepo,
     outputFolder,
     toolFolder: '.trv_build',
-    compilerFolder: '.trv_compiler'
+    compilerFolder: '.trv_compiler',
+    packageManager
   };
   return res;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/manifest",
-  "version": "3.0.0-rc.10",
+  "version": "3.0.0-rc.12",
   "description": "Manifest support",
   "keywords": [
     "path",

package/src/manifest-index.ts

@@ -301,12 +301,13 @@ export class ManifestIndex {
   /**
    * Get local folders that represent the user's controlled input
    */
-  getLocalInputFolders(): string[] {
-    return this.getLocalModules()
-      .flatMap(x =>
-        (!this.manifest.monoRepo || x.sourcePath !== this.manifest.workspacePath) ?
-          [x.sourcePath] : [...Object.keys(x.files)].filter(y => !y.startsWith('$')).map(y => path.resolve(x.sourcePath, y))
-      );
+  getLocalInputFolderMapping(): [folder: string, moduleSourceRoot: string][] {
+    return this.getLocalModules().flatMap(x =>
+      ((!this.manifest.monoRepo || x.sourcePath !== this.manifest.workspacePath) ?
+        [x.sourcePath] : [...Object.keys(x.files)].filter(y => !y.startsWith('$')).map(y => path.resolve(x.sourcePath, y))
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      ).map(f => [f, path.resolve(x.sourceFolder)] as [string, string])
+    );
   }
 
   /**

package/src/package.ts

@@ -179,9 +179,25 @@ export class PackageUtil {
       try {
         return JSON.parse(await fs.readFile(cache, 'utf8'));
       } catch {
-        const text = execSync('npm query .workspace', { cwd: rootPath, encoding: 'utf8', env: { PATH: process.env.PATH, NODE_PATH: process.env.NODE_PATH } });
-        const res: { location: string, name: string }[] = JSON.parse(text);
-        const out = this.#workspaces[rootPath] = res.map(d => ({ sourcePath: d.location, name: d.name }));
+        let out: PackageWorkspaceEntry[];
+        switch (ctx.packageManager) {
+          case 'npm': {
+            const text = execSync('npm query .workspace', { cwd: rootPath, encoding: 'utf8', env: { PATH: process.env.PATH, NODE_PATH: process.env.NODE_PATH } });
+            out = JSON.parse(text)
+              .map((d: { location: string, name: string }) => ({ sourcePath: d.location, name: d.name }));
+            break;
+          }
+          case 'yarn': {
+            const text = execSync('yarn -s workspaces info', { cwd: rootPath, encoding: 'utf8', env: { PATH: process.env.PATH, NODE_PATH: process.env.NODE_PATH } });
+            out = Object.entries<{ location: string }>(JSON.parse(text))
+              .map(([name, { location }]) => ({ sourcePath: location, name }));
+            break;
+          }
+          default: throw new Error(`Unknown package manager: ${ctx.packageManager}`);
+        }
+
+        this.#workspaces[rootPath] = out;
+
         await fs.writeFile(cache, JSON.stringify(out), 'utf8');
       }
     }

package/src/types.ts

@@ -34,6 +34,7 @@ export type ManifestContext = {
   compilerFolder: string;
   monoRepo?: boolean;
   moduleType: 'module' | 'commonjs';
+  packageManager: 'yarn' | 'npm';
 };
 
 export type ManifestRoot = ManifestContext & {

package/src/watch.ts

@@ -22,12 +22,19 @@ async function getWatcher(): Promise<typeof import('@parcel/watcher')> {
  * @param onEvent
  * @private
  */
-export async function watchFolders(folders: string[], onEvent: WatchEventListener, config: WatchConfig = {}): Promise<() => Promise<void>> {
+export async function watchFolders(
+  folders: string[] | [folder: string, targetFolder: string][],
+  onEvent: WatchEventListener,
+  config: WatchConfig = {}
+): Promise<() => Promise<void>> {
   const lib = await getWatcher();
   const createMissing = config.createMissing ?? false;
-  const validFolders = new Set(folders);
+  const validFolders = new Set(folders.map(x => typeof x === 'string' ? x : x[0]));
+
+  const subs = await Promise.all(folders.map(async value => {
+    const folder = typeof value === 'string' ? value : value[0];
+    const targetFolder = typeof value === 'string' ? value : value[1];
 
-  const subs = await Promise.all(folders.map(async folder => {
     if (await fs.stat(folder).then(() => true, () => createMissing)) {
       await fs.mkdir(folder, { recursive: true });
       const ignore = (await fs.readdir(folder)).filter(x => x.startsWith('.') && x.length > 2);
@@ -38,7 +45,7 @@ export async function watchFolders(folders: string[], onEvent: WatchEventListene
           }
           const finalEv = { action: ev.type, file: ev.path };
           if (!config.filter || config.filter(finalEv)) {
-            onEvent(finalEv, folder);
+            onEvent(finalEv, targetFolder);
           }
         }
       }, { ignore: [...ignore, ...config.ignore ?? []] });