@travetto/manifest 3.0.0-rc.9 → 3.0.0

package/README.md

@@ -1,14 +1,269 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
 <!-- Please modify https://github.com/travetto/travetto/tree/main/module/manifest/DOC.ts and execute "npx trv doc" to rebuild -->
 # Manifest
-## Manifest support
+## Support for project indexing, manifesting, along with file watching
 
 **Install: @travetto/manifest**
 ```bash
 npm install @travetto/manifest
+
+# or
+
+yarn add @travetto/manifest
+```
+
+This module aims to be the boundary between the file system and the code.  The module provides:
+
+   
+   *  Project Manifesting
+   *  Manifest Delta
+   *  Class and Function Metadata
+   *  Runtime Indexing
+   *  Path Normalization
+   *  File Watching
+
+## Project Manifesting
+The project manifest fulfills two main goals: Compile-time Support, and Runtime Knowledge of the project.
+
+### Compile-time Support
+During the compilation process, the compiler needs to know every file that is eligible for compilation, when the file was last created/modified, and any specific patterns for interacting with a given file (e.g. transformers vs. testing code vs. support files that happen to share a common extension with code). 
+
+### Runtime Knowledge
+Additionally, once the code has been compiled (or even bundled after that), the executing process needs to know what files are available for loading, and any patterns necessary for knowing which files to load versus which ones to ignore. This allows for dynamic loading of modules/files without knowledge/access to the file system, and in a more performant manner.
+
+## Manifest Delta
+During the compilation process, it is helpful to know how the output content differs from the manifest, which is produced from the source input. The [ManifestDeltaUtil](https://github.com/travetto/travetto/tree/main/module/manifest/src/delta.ts#L21) provides the functionality for a given manifest, and will produce a stream of changes grouped by module.  This is the primary input into the [Compiler](https://github.com/travetto/travetto/tree/main/module/compiler#readme "The compiler infrastructure for the Travetto framework")'s incremental behavior to know when a file has changed and needs to be recompiled.
+
+## Class and Function Metadata
+
+For the framework to work properly, metadata needs to be collected about files, classes and functions to uniquely identify them, with support for detecting changes during live reloads.  To achieve this, every `class` is decorated with an additional field of `Ⲑid`.  `Ⲑid` represents a computed id that is tied to the file/class combination.
+
+`Ⲑid` is used heavily throughout the framework for determining which classes are owned by the framework, and being able to lookup the needed data from the [RootIndex](https://github.com/travetto/travetto/tree/main/module/manifest/src/root-index.ts) using the `getFunctionMetadata` method.
+
+**Code: Test Class**
+```typescript
+export class TestClass {
+  async doStuff(): Promise<void> { }
+}
+```
+
+**Code: Test Class Compiled**
+```javascript
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestClass = void 0;
+const tslib_1 = require("tslib");
+const Ⲑ_root_index_1 = tslib_1.__importStar(require("@travetto/manifest/src/root-index.js"));
+var ᚕf = "@travetto/manifest/doc/test-class.js";
+class TestClass {
+    static Ⲑinit = Ⲑ_root_index_1.RootIndex.registerFunction(TestClass, ᚕf, 197152026, { doStuff: { hash: 51337554 } }, false, false);
+    async doStuff() { }
+}
+exports.TestClass = TestClass;
+```
+
+**Terminal: Index Lookup at Runtime**
+```bash
+$ trv main ./doc/lookup.ts
+
+{
+  id: '@travetto/manifest:doc/test-class￮TestClass',
+  source: './doc/test-class.ts',
+  hash: 197152026,
+  methods: { doStuff: { hash: 51337554 } },
+  abstract: false,
+  synthetic: false
+}
+```
+
+## Module Indexing
+Once the manifest is created, the application runtime can now read this manifest, which allows for influencing runtime behavior. The most common patterns include:
+   
+   *  Loading all source files
+   *  Iterating over every test file
+   *  Finding all source folders for watching
+   *  Find all output folders for watching
+   *  Determining if a module is available or not
+   *  Resource scanning
+   *  Providing contextual information when provided a filename, import name, etc (e.g. logging, testing output)
+
+## Path Normalization
+By default, all paths within the framework are assumed to be in a POSIX style, and all input paths are converted to the POSIX style.  This works appropriately within a Unix and a Windows environment.  This module offers up [path](https://github.com/travetto/travetto/tree/main/module/manifest/src/path.ts#L7) as an equivalent to [Node](https://nodejs.org)'s [http](https://nodejs.org/api/path.html) library.  This allows for consistent behavior across all file-interactions, and also allows for easy analysis if [Node](https://nodejs.org)'s [http](https://nodejs.org/api/path.html) library is ever imported.
+
+## File Watching
+The module also leverages [fetch](https://www.npmjs.com/package/@parcel/watcher), to expose a single function of `watchFolders`. Only the [Compiler](https://github.com/travetto/travetto/tree/main/module/compiler#readme "The compiler infrastructure for the Travetto framework") module packages [fetch](https://www.npmjs.com/package/@parcel/watcher) as a direct dependency.  This means, that in production, by default all watch operations will fail with a missing dependency.
+
+**Code: Watch Folder Signature**
+```typescript
+export type WatchEvent = { action: 'create' | 'update' | 'delete', file: string };
+type EventFilter = (ev: WatchEvent) => boolean;
+
+export type WatchEventListener = (ev: WatchEvent, folder: string) => void;
+export type WatchConfig = {
+  /**
+   * Predicate for filtering events
+   */
+  filter?: EventFilter;
+  /**
+   * List of top level folders to ignore
+   */
+  ignore?: string[];
+  /**
+   * If watching a folder that doesn't exist, should it be created?
+   */
+  createMissing?: boolean;
+  /**
+   * Include files that start with '.'
+   */
+  includeHidden?: boolean;
+};
+
+/**
+ * Leverages @parcel/watcher to watch a series of folders
+ * @param folders
+ * @param onEvent
+ * @private
+ */
+export async function watchFolders(
+  folders: string[] | [folder: string, targetFolder: string][],
+  onEvent: WatchEventListener,
+  config: WatchConfig = {}
+): Promise<() => Promise<void>> {
+```
+
+This method allows for watching one or more folders, and registering a callback that will fire every time a file changes, and which of the registered folders it was triggered within. The return of the `watchFolders` is a cleanup method, that when invoked will remove and stop all watching behavior.
+
+## Anatomy of a Manifest
+
+**Code: Manifest for @travetto/manifest**
+```typescript
+{
+  "generated": 1868155200000,
+  "moduleType": "commonjs",
+  "mainModule": "@travetto/manifest",
+  "mainFolder": "module/manifest",
+  "workspacePath": "<generated>",
+  "monoRepo": true,
+  "outputFolder": ".trv_output",
+  "toolFolder": ".trv_build",
+  "compilerFolder": ".trv_compiler",
+  "packageManager": "npm",
+  "modules": {
+    "@travetto/manifest": {
+      "main": true,
+      "name": "@travetto/manifest",
+      "version": "x.x.x",
+      "local": true,
+      "internal": false,
+      "sourceFolder": "module/manifest",
+      "outputFolder": "node_modules/@travetto/manifest",
+      "files": {
+        "$root": [
+          [ "DOC.html", "unknown", 1868155200000 ],
+          [ "LICENSE", "unknown", 1868155200000 ],
+          [ "README.md", "md", 1868155200000 ]
+        ],
+        "doc": [
+          [ "DOC.ts", "ts", 1868155200000, "doc" ],
+          [ "doc/lookup.ts", "ts", 1868155200000, "doc" ],
+          [ "doc/test-class.ts", "ts", 1868155200000, "doc" ]
+        ],
+        "$index": [
+          [ "__index__.ts", "ts", 1868155200000 ]
+        ],
+        "$package": [
+          [ "package.json", "package-json", 1868155200000 ]
+        ],
+        "test": [
+          [ "test/path.ts", "ts", 1868155200000, "test" ],
+          [ "test/root-index.ts", "ts", 1868155200000, "test" ]
+        ],
+        "test/fixtures": [
+          [ "test/fixtures/simple.ts", "fixture", 1868155200000, "test" ]
+        ],
+        "$transformer": [
+          [ "support/transformer.function-metadata.ts", "ts", 1868155200000, "compile" ]
+        ],
+        "src": [
+          [ "src/delta.ts", "ts", 1868155200000 ],
+          [ "src/dependencies.ts", "ts", 1868155200000 ],
+          [ "src/manifest-index.ts", "ts", 1868155200000 ],
+          [ "src/module.ts", "ts", 1868155200000 ],
+          [ "src/package.ts", "ts", 1868155200000 ],
+          [ "src/path.ts", "ts", 1868155200000 ],
+          [ "src/root-index.ts", "ts", 1868155200000 ],
+          [ "src/types.ts", "ts", 1868155200000 ],
+          [ "src/typings.d.ts", "typings", 1868155200000 ],
+          [ "src/util.ts", "ts", 1868155200000 ],
+          [ "src/watch.ts", "ts", 1868155200000 ]
+        ],
+        "bin": [
+          [ "bin/context.d.ts", "typings", 1868155200000 ],
+          [ "bin/context.js", "js", 1868155200000 ]
+        ]
+      },
+      "profiles": [ "std" ],
+      "parents": []
+    }
+  }
+}
 ```
 
-This module provides functionality for basic path functionality and common typings for manifests
+### General Context
+The general context describes the project-space and any important information for how to build/execute the code.
+
+The context contains:
+   
+   *  A generated timestamp
+   *  Module Type: [commonjs](https://nodejs.org/api/modules.html) or [module](https://nodejs.org/api/esm.html)
+   *  The main module to execute. **Note**: This primarily pertains to mono-repo support when there are multiple modules in the project
+   *  The root path of the project/workspace
+   *  Whether or not the project is a mono-repo. **Note**: This is determined by using the 'workspaces' field in your [object Object]
+   *  The location where all compiled code will be stored.  Defaults to: `.trv_output`.  **Note**: Can be overridden in your [object Object] in 'travetto.outputFolder'
+   *  The location where the intermediate compiler will be created. Defaults to: `.trv_compiler`
+   *  The location where tooling will be able to write to. Defaults to: `.trv_output`
+   *  Which package manager is in use [Npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) or [Yarn](https://yarnpg.com)
+
+### Modules
+The modules represent all of the [Travetto](https://travetto.dev)-aware dependencies (including dev dependencies) used for compiling, testing and executing.  A prod-only version is produced when packaging the final output.
 
-### Module Indexing
-The bootstrap process will also produce an index of all source files, which allows for fast in-memory scanning.  This allows for all the automatic discovery that is used within the framework.
+Each module contains:
+   
+   *  The dependency npm name
+   *  The dependency version
+   *  A flag to determine if its a local module
+   *  A flag to determine if the module is public (could be published to npm)
+   *  The path to the source folder, relative to the workspace root
+   *  The path to the output folder, relative to the workspace output root
+   *  The list of all files
+   *  The profiles a module applies to.  Values are std, test, compile, doc.  Any empty value implies std
+   *  Parent modules that imported this module
+
+### Module Files
+The module files are a simple categorization of files into a predetermined set of folders:
+   
+   *  $root - All uncategorized files at the module root
+   *  $index - __index__.ts, index.ts files at the root of the project
+   *  $package - The [Package JSON](https://docs.npmjs.com/cli/v9/configuring-npm/package-json) for the project
+   *  src - Code that should be automatically loaded at runtime. All .ts files under the src/ folder
+   *  test - Code that contains test files. All .ts files under the test/ folder
+   *  test/fixtures - Test resource files, pertains to the main module only. Located under test/fixtures/
+   *  resources - Packaged resource, meant to pertain to the main module only. Files, under resources/
+   *  support - All .ts files under the support/ folder
+   *  support/resources - Packaged resource files, meant to be included by other modules, under support/resources/
+   *  support/fixtures - Test resources meant to shared across modules.  Under support/fixtures/
+   *  doc - Documentation files. All .ts files under the doc/ folder
+   *  $transformer - All .ts files under the pattern support/transform*.  These are used during compilation and never at runtime
+   *  bin - Entry point .js files.  All .js files under the bin/ folder
+
+Within each file there is a pattern of either a 3 or 4 element array:
+
+**Code: Sample file**
+```typescript
+[
+  "test/path.ts", // The module relative source path
+  "ts", // The file type ts, js, package-json, typings, md, json, unknown
+  1676751649201.1897, // Stat timestamp
+  "test" // Optional profile
+]
+```

package/bin/context.js

@@ -101,15 +101,19 @@ 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,
-    mainModule,
+    mainModule: mainModule ?? 'untitled', // When root package.json is missing a name
     mainFolder,
     workspacePath,
     monoRepo,
     outputFolder,
-    compilerFolder: '.trv_compiler'
+    toolFolder: '.trv_build',
+    compilerFolder: '.trv_compiler',
+    packageManager
   };
   return res;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/manifest",
-  "version": "3.0.0-rc.9",
-  "description": "Manifest support",
+  "version": "3.0.0",
+  "description": "Support for project indexing, manifesting, along with file watching",
   "keywords": [
     "path",
     "package",

package/src/manifest-index.ts

@@ -99,11 +99,11 @@ export class ManifestIndex {
     this.#importToEntry.clear();
     this.#sourceToEntry.clear();
 
-    this.#modules = Object.values(this.manifest.modules)
+    this.#modules = Object.values(this.#manifest.modules)
       .map(m => ({
         ...m,
         outputPath: this.#resolveOutput(m.outputFolder),
-        sourcePath: path.resolve(this.manifest.workspacePath, m.sourceFolder),
+        sourcePath: path.resolve(this.#manifest.workspacePath, m.sourceFolder),
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         files: Object.fromEntries(
           Object.entries(m.files).map(([folder, files]) => [folder, this.#moduleFiles(m, files ?? [])])
@@ -200,7 +200,7 @@ export class ManifestIndex {
    * Is module installed?
    */
   hasModule(name: string): boolean {
-    return name in this.manifest.modules;
+    return name in this.#manifest.modules;
   }
 
   /**
@@ -261,7 +261,7 @@ export class ManifestIndex {
    * Build module list from an expression list (e.g. `@travetto/app,-@travetto/log)
    */
   getModuleList(mode: 'local' | 'all', exprList: string = ''): Set<string> {
-    const allMods = Object.keys(this.manifest.modules);
+    const allMods = Object.keys(this.#manifest.modules);
     const active = new Set<string>(
       mode === 'local' ? this.getLocalModules().map(x => x.name) :
         (mode === 'all' ? allMods : [])
@@ -297,4 +297,23 @@ export class ManifestIndex {
     }
     return out;
   }
+
+  /**
+   * Get local folders that represent the user's controlled input
+   */
+  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(this.#manifest.workspacePath, x.sourcePath, y))
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      ).map(f => [f, path.resolve(this.#manifest.workspacePath, x.sourceFolder)] as [string, string])
+    );
+  }
+
+  /**
+   * Get local output folders
+   */
+  getLocalOutputFolders(): string[] {
+    return this.getLocalModules().map(x => x.outputPath);
+  }
 }

package/src/package.ts

@@ -13,6 +13,14 @@ export class PackageUtil {
   static #cache: Record<string, Package> = {};
   static #workspaces: Record<string, PackageWorkspaceEntry[]> = {};
 
+  /**
+   * Clear out cached package file reads
+   */
+  static clearCache(): void {
+    this.#cache = {};
+    this.#workspaces = {};
+  }
+
   static resolveImport = (library: string): string => this.#req.resolve(library);
 
   /**
@@ -83,10 +91,14 @@ export class PackageUtil {
     if (forceRead) {
       delete this.#cache[modulePath];
     }
-    return this.#cache[modulePath] ??= JSON.parse(readFileSync(
+    const res = this.#cache[modulePath] ??= JSON.parse(readFileSync(
       modulePath.endsWith('.json') ? modulePath : path.resolve(modulePath, 'package.json'),
       'utf8'
     ));
+
+    res.name ??= 'untitled'; // If a package.json (root-only) is missing a name, allows for npx execution
+
+    return res;
   }
 
   /**
@@ -171,9 +183,24 @@ 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;
+          }
+        }
+
+        this.#workspaces[rootPath] = out;
+
         await fs.writeFile(cache, JSON.stringify(out), 'utf8');
       }
     }

package/src/root-index.ts

@@ -118,24 +118,6 @@ class $RootIndex extends ManifestIndex {
     const id = clsId === undefined ? '' : typeof clsId === 'string' ? clsId : clsId.Ⲑid;
     return this.#metadata.get(id);
   }
-
-  /**
-   * 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))
-      );
-  }
-
-  /**
-   * Get local output folders
-   */
-  getLocalOutputFolders(): string[] {
-    return this.getLocalModules().map(x => x.outputPath);
-  }
 }
 
 let index: $RootIndex | undefined;

package/src/types.ts

@@ -30,9 +30,11 @@ export type ManifestContext = {
   mainFolder: string;
   workspacePath: string;
   outputFolder: string;
+  toolFolder: string;
   compilerFolder: string;
   monoRepo?: boolean;
   moduleType: 'module' | 'commonjs';
+  packageManager: 'yarn' | 'npm';
 };
 
 export type ManifestRoot = ManifestContext & {

package/src/util.ts

@@ -6,18 +6,20 @@ import { path } from './path';
 import { ManifestContext, ManifestRoot } from './types';
 import { ManifestModuleUtil } from './module';
 
-export const MANIFEST_FILE = 'manifest.json';
+const MANIFEST_FILE = 'manifest.json';
 
 /**
  * Manifest utils
  */
 export class ManifestUtil {
-
-  static async writeJsonWithBuffer(ctx: ManifestContext, filename: string, obj: object): Promise<string> {
-    const tempName = path.resolve(ctx.workspacePath, ctx.mainFolder, filename).replace(/[\/\\: ]/g, '_');
+  /**
+   * Write file and copy over when ready
+   */
+  static async #writeJsonWithBuffer(ctx: ManifestContext, filename: string, obj: object): Promise<string> {
+    const tempName = `manifest.${process.ppid}.${process.pid}.json.${Date.now()}`;
     const file = path.resolve(ctx.workspacePath, ctx.outputFolder, 'node_modules', ctx.mainModule, filename);
     await fs.mkdir(path.dirname(file), { recursive: true });
-    const temp = path.resolve(os.tmpdir(), `${tempName}.${Date.now()}`);
+    const temp = path.resolve(os.tmpdir(), tempName);
     await fs.writeFile(temp, JSON.stringify(obj), 'utf8');
     await fs.copyFile(temp, file);
     fs.unlink(temp);
@@ -44,6 +46,24 @@ export class ManifestUtil {
     };
   }
 
+  /**
+   * Produce a production manifest from a given manifest
+   */
+  static createProductionManifest(manifest: ManifestRoot): ManifestRoot {
+    return {
+      ...manifest,
+      // If in prod mode, only include std modules
+      modules: Object.fromEntries(
+        Object.values(manifest.modules)
+          .filter(x => x.profiles.includes('std'))
+          .map(m => [m.name, m])
+      ),
+      // Mark output folder/workspace path as portable
+      outputFolder: '',
+      workspacePath: '',
+    };
+  }
+
   /**
    * Read manifest, synchronously
    *
@@ -67,7 +87,21 @@ export class ManifestUtil {
    * Write manifest for a given context, return location
    */
   static writeManifest(ctx: ManifestContext, manifest: ManifestRoot): Promise<string> {
-    return this.writeJsonWithBuffer(ctx, MANIFEST_FILE, manifest);
+    return this.#writeJsonWithBuffer(ctx, MANIFEST_FILE, manifest);
+  }
+
+  /**
+   * Write a manifest to a specific file, if no file extension provided, the file is assumed to be a folder
+   */
+  static async writeManifestToFile(location: string, manifest: ManifestRoot): Promise<string> {
+    if (!location.endsWith('.json')) {
+      location = path.resolve(location, MANIFEST_FILE);
+    }
+
+    await fs.mkdir(path.dirname(location), { recursive: true });
+    await fs.writeFile(location, JSON.stringify(manifest), 'utf8');
+
+    return location;
   }
 
   /**

package/src/watch.ts

@@ -1,10 +1,5 @@
 import fs from 'fs/promises';
-
-export type WatchEvent = { action: 'create' | 'update' | 'delete', file: string };
-
-type EventListener = (ev: WatchEvent, folder: string) => void;
-type EventFilter = (ev: WatchEvent) => boolean;
-type WatchConfig = { filter?: EventFilter, ignore?: string[] };
+import { path } from './path';
 
 async function getWatcher(): Promise<typeof import('@parcel/watcher')> {
   try {
@@ -15,22 +10,61 @@ async function getWatcher(): Promise<typeof import('@parcel/watcher')> {
   }
 }
 
+export type WatchEvent = { action: 'create' | 'update' | 'delete', file: string };
+type EventFilter = (ev: WatchEvent) => boolean;
+
+export type WatchEventListener = (ev: WatchEvent, folder: string) => void;
+export type WatchConfig = {
+  /**
+   * Predicate for filtering events
+   */
+  filter?: EventFilter;
+  /**
+   * List of top level folders to ignore
+   */
+  ignore?: string[];
+  /**
+   * If watching a folder that doesn't exist, should it be created?
+   */
+  createMissing?: boolean;
+  /**
+   * Include files that start with '.'
+   */
+  includeHidden?: boolean;
+};
+
 /**
  * Leverages @parcel/watcher to watch a series of folders
  * @param folders
  * @param onEvent
  * @private
  */
-export async function watchFolders(folders: string[], onEvent: EventListener, 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 subs = await Promise.all(folders.map(async folder => {
-    if (await fs.stat(folder).then(() => true, () => false)) {
+  const createMissing = config.createMissing ?? false;
+  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];
+
+    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);
       return lib.subscribe(folder, (err, events) => {
         for (const ev of events) {
-          const finalEv = { action: ev.type, file: ev.path };
-          if (!config.filter || config.filter(finalEv)) {
-            onEvent(finalEv, folder);
+          const finalEv = { action: ev.type, file: path.toPosix(ev.path) };
+          if (ev.type === 'delete' && validFolders.has(finalEv.file)) {
+            return process.exit(0); // Exit when watched folder is removed
+          }
+          const isHidden = !config.includeHidden && finalEv.file.replace(targetFolder, '').includes('/.');
+          const matches = !isHidden && (!config.filter || config.filter(finalEv));
+          if (matches) {
+            onEvent(finalEv, targetFolder);
           }
         }
       }, { ignore: [...ignore, ...config.ignore ?? []] });