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

package/README.md

@@ -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.4",
   "description": "Support for project indexing, manifesting, along with file watching",
   "keywords": [
     "path",

package/src/delta.ts

@@ -40,14 +40,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');

package/src/manifest-index.ts

@@ -61,12 +61,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 };
@@ -100,7 +100,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 +190,7 @@ export class ManifestIndex {
    */
   getFromImport(imp: string): IndexedFile | undefined {
     // Strip ext
-    imp = ManifestModuleUtil.sourceToBlankExt(imp);
+    imp = ManifestModuleUtil.withoutSourceExtension(imp);
     return this.#importToEntry.get(imp);
   }
 

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, '');
   }
 }