@travetto/manifest 3.0.1 → 3.0.2-rc.1

package/README.md

@@ -96,14 +96,14 @@ The module also leverages [fetch](https://www.npmjs.com/package/@parcel/watcher)
 **Code: Watch Folder Signature**
 ```typescript
 export type WatchEvent = { action: 'create' | 'update' | 'delete', file: string };
-type EventFilter = (ev: WatchEvent) => boolean;
+export type WatchEventFilter = (ev: WatchEvent) => boolean;
 
 export type WatchEventListener = (ev: WatchEvent, folder: string) => void;
 export type WatchConfig = {
   /**
    * Predicate for filtering events
    */
-  filter?: EventFilter;
+  filter?: WatchEventFilter;
   /**
    * List of top level folders to ignore
    */
@@ -116,18 +116,22 @@ export type WatchConfig = {
    * Include files that start with '.'
    */
   includeHidden?: boolean;
+  /**
+   * Should watching prevent normal exiting, until watch is removed?
+   */
+  persistent?: boolean;
 };
 
 /**
- * Leverages @parcel/watcher to watch a series of folders
- * @param folders
+ * Watch files for a given folder
+ * @param folder
  * @param onEvent
- * @private
+ * @param options
  */
-export async function watchFolders(
-  folders: string[] | [folder: string, targetFolder: string][],
+export async function watchFolderImmediate(
+  folder: string,
   onEvent: WatchEventListener,
-  config: WatchConfig = {}
+  options: WatchConfig = {}
 ): Promise<() => Promise<void>> {
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/manifest",
-  "version": "3.0.1",
+  "version": "3.0.2-rc.1",
   "description": "Support for project indexing, manifesting, along with file watching",
   "keywords": [
     "path",

package/src/watch.ts

@@ -32,6 +32,10 @@ export type WatchConfig = {
    * Include files that start with '.'
    */
   includeHidden?: boolean;
+  /**
+   * Should watching prevent normal exiting, until watch is removed?
+   */
+  persistent?: boolean;
 };
 
 /**
@@ -46,7 +50,7 @@ export async function watchFolderImmediate(
   options: WatchConfig = {}
 ): Promise<() => Promise<void>> {
   const watchPath = path.resolve(folder);
-  const watcher = watch(watchPath, { persistent: true, encoding: 'utf8' });
+  const watcher = watch(watchPath, { persistent: options.persistent, encoding: 'utf8' });
   const lastStats: Record<string, Stats | undefined> = {};
   const invalidFilter = (el: string): boolean =>
     (el === '.' || el === '..' || (!options.includeHidden && el.startsWith('.')) || !!options.ignore?.includes(el));
@@ -130,6 +134,11 @@ export async function watchFolders(
   let finalProm: Promise<void> | undefined;
   const remove = (): Promise<void> => finalProm ??= Promise.all(subs.map(x => x?.unsubscribe())).then(() => { });
 
+  // Cleanup on intent to exit
+  if (!config.persistent) {
+    process.on('SIGUSR2', remove);
+  }
+
   // Cleanup on exit
   process.on('exit', remove);
 

package/support/transformer.function-metadata.ts

@@ -7,6 +7,7 @@ import {
 
 const MANIFEST_MOD = '@travetto/manifest';
 const MANIFEST_IDX = `${MANIFEST_MOD}/__index__`;
+const ENTRY_POINT = 'support/entry';
 
 const ROOT_IDX_IMPORT = `${MANIFEST_MOD}/src/root-index`;
 const ROOT_IDX_CLS = 'RootIndex';
@@ -30,13 +31,10 @@ interface MetadataInfo {
  */
 export class RegisterTransformer {
 
-  static #valid(state: TransformerState): boolean {
-    return !state.importName.startsWith(MANIFEST_MOD) ||
-      (
-        !state.importName.includes('/src/') &&
-        !state.importName.includes('/support/') &&
-        state.importName !== MANIFEST_IDX
-      );
+  static #valid({ importName: imp }: TransformerState): boolean {
+    return !imp.startsWith(MANIFEST_MOD) ?
+      !imp.includes(ENTRY_POINT) :
+      !(/[/](src|support)[/]/.test(imp) || imp === MANIFEST_IDX);
   }
 
   /**