@travetto/manifest 7.0.0-rc.1 → 7.0.0-rc.2

package/package.json

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

package/src/delta.ts

@@ -4,10 +4,10 @@ import { ManifestModuleUtil } from './module.ts';
 import { path } from './path.ts';
 
 import type { ManifestModule, ManifestModuleCore, ManifestModuleFile, ManifestRoot } from './types/manifest.ts';
-import type { ManifestModuleFileType, ManifestModuleFolderType } from './types/common.ts';
+import type { ChangeEventType, ManifestModuleFileType, ManifestModuleFolderType } from './types/common.ts';
 import type { ManifestContext } from './types/context.ts';
 
-type DeltaEventType = 'added' | 'changed' | 'removed' | 'missing' | 'dirty';
+type DeltaEventType = ChangeEventType | 'missing' | 'dirty';
 type DeltaModule = ManifestModuleCore & { files: Record<string, ManifestModuleFile> };
 export type DeltaEvent = { file: string, type: DeltaEventType, module: string, sourceFile: string };
 
@@ -52,17 +52,17 @@ export class ManifestDeltaUtil {
       right.delete(ManifestModuleUtil.withoutSourceExtension(file));
 
       if (!stat) {
-        add(file, 'added');
+        add(file, 'create');
       } else {
         const rightTimestamp = this.#getNewest(stat);
         if (leftTimestamp > rightTimestamp) {
-          add(file, 'changed');
+          add(file, 'update');
         }
       }
     }
     // Deleted
     for (const file of right) {
-      add(file, 'removed');
+      add(file, 'delete');
     }
     return out;
   }

package/src/file.ts

@@ -16,13 +16,6 @@ export class ManifestFileUtil {
     await fs.rm(temp, { force: true });
   }
 
-  /**
-   * Read as json
-   */
-  static async readAsJson<T = unknown>(file: string): Promise<T> {
-    return JSON.parse(await fs.readFile(file, 'utf8'));
-  }
-
   /**
    * Read as json, sync
    */

package/src/manifest-index.ts

@@ -192,6 +192,14 @@ export class ManifestIndex {
     return this.#importToEntry.get(imp);
   }
 
+  /**
+   * Get from import path or source file
+   * @param importOrSource
+   */
+  getFromImportOrSource(importOrSource: string): IndexedFile | undefined {
+    return this.getFromImport(importOrSource) ?? this.getFromSource(path.resolve(importOrSource));
+  }
+
   /**
    * Get module from source file
    * @param source
@@ -256,6 +264,15 @@ export class ManifestIndex {
     return lookup(file.replace(`${base}/`, '').split('/'));
   }
 
+  /**
+   * Find the module for an arbitrary import
+   */
+  findModuleForArbitraryImport(imp: string): IndexedModule | undefined {
+    const importParts = imp.split('/');
+    const module = imp.startsWith('@') ? importParts.slice(0, 2).join('/') : importParts[0];
+    return this.getModule(module);
+  }
+
   /**
    * Get manifest module by name
    */

package/src/package.ts

@@ -99,20 +99,21 @@ export class PackageUtil {
   static async resolveWorkspaces(ctx: ManifestContext): Promise<PackageWorkspaceEntry[]> {
     const rootPath = ctx.workspace.path;
     const cache = path.resolve(rootPath, ctx.build.outputFolder, 'workspaces.json');
-    return this.#workspaces[rootPath] ??= await ManifestFileUtil.readAsJson<PackageWorkspaceEntry[]>(cache)
-      .catch(async () => {
-        let out: PackageWorkspaceEntry[];
-        switch (ctx.workspace.manager) {
-          case 'yarn':
-          case 'npm': {
-            const workspaces = await this.#exec<{ location: string, name: string }[]>(rootPath, 'npm query .workspace');
-            out = workspaces.map(mod => ({ path: path.resolve(ctx.workspace.path, mod.location), name: mod.name }));
-            break;
-          }
+    try {
+      return this.#workspaces[rootPath] ??= ManifestFileUtil.readAsJsonSync<PackageWorkspaceEntry[]>(cache);
+    } catch {
+      let out: PackageWorkspaceEntry[];
+      switch (ctx.workspace.manager) {
+        case 'yarn':
+        case 'npm': {
+          const workspaces = await this.#exec<{ location: string, name: string }[]>(rootPath, 'npm query .workspace');
+          out = workspaces.map(mod => ({ path: path.resolve(ctx.workspace.path, mod.location), name: mod.name }));
+          break;
         }
-        await ManifestFileUtil.bufferedFileWrite(cache, JSON.stringify(out));
-        return out;
-      });
+      }
+      await ManifestFileUtil.bufferedFileWrite(cache, JSON.stringify(out));
+      return out;
+    }
   }
 
   /**

package/src/types/common.ts

@@ -8,4 +8,6 @@ export type ManifestModuleFolderType =
   'test/fixtures' | 'support/fixtures' | 'support/resources' |
   '$transformer';
 
-export type ManifestModuleRole = 'std' | 'test' | 'doc' | 'compile' | 'build';
+export type ManifestModuleRole = 'std' | 'test' | 'doc' | 'compile' | 'build';
+
+export type ChangeEventType = 'create' | 'update' | 'delete';