@travetto/manifest 5.0.0-rc.3 → 5.0.0-rc.5

package/README.md

@@ -30,7 +30,7 @@ During the compilation process, the compiler needs to know every file that is el
 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.
+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#L23) 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. 
@@ -51,7 +51,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestClass = void 0;
 const tslib_1 = require("tslib");
 const Ⲑ_function_1 = tslib_1.__importStar(require("@travetto/runtime/src/function.js"));
-var ᚕm = ["@travetto/manifest", "doc/test-class"];
+var ᚕm = ["@travetto/manifest", "doc/test-class.ts"];
 class TestClass {
     static Ⲑinit = Ⲑ_function_1.registerFunction(TestClass, ᚕm, { hash: 197152026, lines: [1, 3] }, { doStuff: { hash: 51337554, lines: [2, 2] } }, false, false);
     async doStuff() { }

package/package.json

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

package/src/delta.ts

@@ -15,6 +15,8 @@ const VALID_SOURCE_FOLDERS = new Set<ManifestModuleFolderType>(['bin', 'src', 't
 const VALID_OUTPUT_TYPE = new Set<ManifestModuleFileType>(['js', 'ts', 'package-json']);
 const VALID_SOURCE_TYPE = new Set<ManifestModuleFileType>([...VALID_OUTPUT_TYPE, 'typings']);
 
+const TypedObject: { keys<T = unknown, K extends keyof T = keyof T>(o: T): K[] } & ObjectConstructor = Object;
+
 /**
  * Produce delta for the manifest
  */
@@ -40,14 +42,14 @@ export class ManifestDeltaUtil {
           const type = ManifestModuleUtil.getFileType(x);
           return VALID_SOURCE_TYPE.has(type);
         })
-        .map(x => ManifestModuleUtil.sourceToBlankExt(x.replace(`${root}/`, '')))
+        .map(x => ManifestModuleUtil.withoutSourceExtension(x.replace(`${root}/`, '')))
     );
 
     for (const el of Object.keys(left.files)) {
-      const output = ManifestModuleUtil.sourceToOutputExt(`${outputFolder}/${left.outputFolder}/${el}`);
+      const output = ManifestModuleUtil.withOutputExtension(`${outputFolder}/${left.outputFolder}/${el}`);
       const [, , leftTs] = left.files[el];
       const stat = await fs.stat(output).catch(() => undefined);
-      right.delete(ManifestModuleUtil.sourceToBlankExt(el));
+      right.delete(ManifestModuleUtil.withoutSourceExtension(el));
 
       if (!stat) {
         add(el, 'added');
@@ -72,8 +74,7 @@ export class ManifestDeltaUtil {
    */
   static #flattenModuleFiles(m: ManifestModule): Record<string, ManifestModuleFile> {
     const out: Record<string, ManifestModuleFile> = {};
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    for (const key of Object.keys(m.files) as (ManifestModuleFolderType[])) {
+    for (const key of TypedObject.keys(m.files)) {
       if (!VALID_SOURCE_FOLDERS.has(key)) {
         continue;
       }

package/src/manifest-index.ts

@@ -4,7 +4,6 @@ import { ManifestModuleUtil } from './module';
 import { path } from './path';
 import { ManifestUtil } from './util';
 
-import type { ManifestModuleFolderType } from './types/common';
 import type { ManifestModule, ManifestRoot, ManifestModuleFile, IndexedModule, IndexedFile, FindConfig } from './types/manifest';
 
 const TypedObject: {
@@ -61,12 +60,12 @@ export class ManifestIndex {
     return files.map(([f, type, ts, role = 'std']) => {
       const isSource = type === 'ts' || type === 'js';
       const sourceFile = path.resolve(this.#manifest.workspace.path, m.sourceFolder, f);
-      const js = isSource ? ManifestModuleUtil.sourceToOutputExt(f) : f;
+      const js = isSource ? ManifestModuleUtil.withOutputExtension(f) : f;
       const outputFile = this.#resolveOutput(m.outputFolder, js);
-      const modImport = `${m.name}/${js}`;
-      let id = modImport.replace(`${m.name}/`, _ => _.replace(/[/]$/, ':'));
+      const modImport = `${m.name}/${f}`;
+      let id = `${m.name}:${f}`;
       if (isSource) {
-        id = ManifestModuleUtil.sourceToBlankExt(id);
+        id = ManifestModuleUtil.withoutSourceExtension(id);
       }
 
       return { id, type, sourceFile, outputFile, import: modImport, role, relativeFile: f, module: m.name };
@@ -88,10 +87,9 @@ export class ManifestIndex {
         outputPath: this.#resolveOutput(m.outputFolder),
         sourcePath: path.resolve(this.#manifest.workspace.path, m.sourceFolder),
         children: new Set(),
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        files: Object.fromEntries(
-          Object.entries(m.files).map(([folder, files]) => [folder, this.#moduleFiles(m, files ?? [])])
-        ) as Record<ManifestModuleFolderType, IndexedFile[]>
+        files: TypedObject.fromEntries(
+          TypedObject.entries(m.files).map(([folder, files]) => [folder, this.#moduleFiles(m, files ?? [])])
+        )
       }));
 
     for (const mod of this.#modules) {
@@ -100,7 +98,8 @@ export class ManifestIndex {
           this.#outputToEntry.set(entry.outputFile, entry);
           this.#sourceToEntry.set(entry.sourceFile, entry);
           this.#importToEntry.set(entry.import, entry);
-          this.#importToEntry.set(entry.import.replace(/[.]js$/, ''), entry);
+          this.#importToEntry.set(ManifestModuleUtil.withoutSourceExtension(entry.import), entry);
+          this.#importToEntry.set(ManifestModuleUtil.withOutputExtension(entry.import), entry);
         }
       }
     }
@@ -189,7 +188,7 @@ export class ManifestIndex {
    */
   getFromImport(imp: string): IndexedFile | undefined {
     // Strip ext
-    imp = ManifestModuleUtil.sourceToBlankExt(imp);
+    imp = ManifestModuleUtil.withoutSourceExtension(imp);
     return this.#importToEntry.get(imp);
   }
 
@@ -212,8 +211,8 @@ export class ManifestIndex {
     for (const expr of exprList.split(/\s*,\s*/g)) {
       const [, neg, mod] = expr.match(/(-|[+])?([^+\- ]+)$/) ?? [];
       if (mod) {
-        const patt = new RegExp(`^${mod.replace(/[*]/g, '.*')}$`);
-        for (const m of allMods.filter(x => patt.test(x))) {
+        const pattern = new RegExp(`^${mod.replace(/[*]/g, '.*')}$`);
+        for (const m of allMods.filter(x => pattern.test(x))) {
           active[neg ? 'delete' : 'add'](m);
         }
       }

package/src/module.ts

@@ -48,7 +48,7 @@ export class ManifestModuleUtil {
   /**
    * Replace a source file's extension with a given value
    */
-  static #sourceToExtension(inputFile: string, ext: string): string {
+  static #pathToExtension(inputFile: string, ext: string): string {
     return inputFile.replace(/[.][tj]sx?$/, ext);
   }
 
@@ -227,14 +227,14 @@ export class ManifestModuleUtil {
   /**
    * Get the output file name for a given input
    */
-  static sourceToOutputExt(inputFile: string): string {
-    return this.#sourceToExtension(inputFile, '.js');
+  static withOutputExtension(inputFile: string): string {
+    return this.#pathToExtension(inputFile, '.js');
   }
 
   /**
    * Get the file without an extension
    */
-  static sourceToBlankExt(inputFile: string): string {
-    return this.#sourceToExtension(inputFile, '');
+  static withoutSourceExtension(inputFile: string): string {
+    return this.#pathToExtension(inputFile, '');
   }
 }