@travetto/compiler 5.0.11 → 5.0.12

package/bin/common.js

@@ -57,10 +57,11 @@ async function getEntry() {
   }
 
   // Load module on demand
+  /** @type {import('@travetto/manifest/src/context')} */
   const { getManifestContext } = await import(manifestJs);
 
   /** @type {Ctx} */
-  const ctx = getManifestContext();
+  const ctx = getManifestContext(process.cwd(), process.env.TRV_MODULE);
   const target = getTarget.bind(null, ctx);
 
   // Setup Tsconfig

package/bin/manifest-context.mjs

@@ -1,121 +1,56 @@
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
 import { createRequire } from 'node:module';
-const TOOL_FOLDER = '.trv/tool';
-const COMPILER_FOLDER = '.trv/compiler';
-const OUTPUT_FOLDER = '.trv/output';
-const TYPES_FOLDER = '.trv/types';
-const WS_ROOT = {};
-function readPackage(dir) {
-    dir = dir.endsWith('.json') ? path.dirname(dir) : dir;
-    try {
-        const v = readFileSync(path.resolve(dir, 'package.json'), 'utf8');
-        return ({ ...JSON.parse(v), path: path.resolve(dir) });
-    }
-    catch { }
-}
-function findPackage(dir) {
-    let prev;
-    let pkg, curr = path.resolve(dir);
-    while (!pkg && curr !== prev) {
-        pkg = readPackage(curr);
-        [prev, curr] = [curr, path.dirname(curr)];
-    }
-    if (!pkg) {
-        throw new Error('Could not find a package.json');
-    }
-    else {
-        return pkg;
-    }
-}
-function resolveWorkspace(base = process.cwd()) {
-    if (base in WS_ROOT) {
-        return WS_ROOT[base];
-    }
-    let folder = base;
+const toPort = (pth) => (Math.abs([...pth].reduce((a, b) => (a * 33) ^ b.charCodeAt(0), 5381)) % 29000) + 20000;
+const toPosix = (pth) => pth.replaceAll('\\', '/');
+const readPackage = (file) => ({ ...JSON.parse(readFileSync(file, 'utf8')), path: toPosix(path.dirname(file)) });
+function findPackage(base, pred) {
+    let folder = `${base}/.`;
     let prev;
     let pkg;
-    while (prev !== folder) {
+    do {
         prev = folder;
-        pkg = readPackage(folder) ?? pkg;
-        if ((pkg && (!!pkg.workspaces || !!pkg.travetto?.build?.isolated)) ||
-            existsSync(path.resolve(folder, '.git'))) {
-            break;
-        }
         folder = path.dirname(folder);
-    }
+        const folderPkg = path.resolve(folder, 'package.json');
+        pkg = existsSync(folderPkg) ? readPackage(folderPkg) : pkg;
+    } while (prev !== folder &&
+        !pred(pkg) &&
+        !existsSync(path.resolve(folder, '.git')));
     if (!pkg) {
         throw new Error('Could not find a package.json');
     }
-    return WS_ROOT[base] = {
-        ...pkg,
-        name: pkg.name ?? 'untitled',
-        type: pkg.type,
-        manager: existsSync(path.resolve(pkg.path, 'yarn.lock')) ? 'yarn' : 'npm',
-        resolve: createRequire(`${pkg.path}/node_modules`).resolve.bind(null),
-        stripRoot: (full) => full === pkg.path ? '' : full.replace(`${pkg.path}/`, ''),
-        mono: !!pkg.workspaces
-    };
-}
-function getCompilerUrl(ws) {
-    const port = (Math.abs([...ws.path].reduce((a, b) => (a * 33) ^ b.charCodeAt(0), 5381)) % 29000) + 20000;
-    return `http://localhost:${port}`;
-}
-function resolveModule(workspace, folder) {
-    let mod;
-    if (!folder && process.env.TRV_MODULE) {
-        mod = process.env.TRV_MODULE;
-        if (/[.][cm]?(t|j)sx?$/.test(mod)) {
-            try {
-                process.env.TRV_MODULE = mod = findPackage(path.dirname(mod)).name;
-            }
-            catch {
-                process.env.TRV_MODULE = mod = '';
-            }
-        }
-    }
-    if (mod) {
-        try {
-            folder = path.dirname(workspace.resolve(`${mod}/package.json`));
-        }
-        catch {
-            const workspacePkg = readPackage(workspace.path);
-            if (workspacePkg?.name === mod) {
-                folder = workspace.path;
-            }
-            else {
-                throw new Error(`Unable to resolve location for ${folder}`);
-            }
-        }
-    }
-    return findPackage(folder ?? '.');
+    return pkg;
 }
-export function getManifestContext(folder) {
-    const workspace = resolveWorkspace();
-    const mod = resolveModule(workspace, folder);
+export function getManifestContext(root, mod) {
+    const workspace = findPackage(root, pkg => !!pkg?.workspaces || !!pkg?.travetto?.build?.isolated);
     const build = workspace.travetto?.build ?? {};
+    const resolve = createRequire(path.resolve(workspace.path, 'node_modules')).resolve.bind(null);
+    const wsPrefix = `${workspace.path}/`;
+    const modPkg = mod ?
+        readPackage(resolve(`${mod}/package.json`)) :
+        findPackage(root, pkg => !!pkg) ?? workspace;
     return {
         workspace: {
-            name: workspace.name,
+            name: workspace.name ?? 'untitled',
             path: workspace.path,
-            mono: workspace.mono,
-            manager: workspace.manager,
+            mono: !!workspace.workspaces,
+            manager: existsSync(path.resolve(workspace.path, 'yarn.lock')) ? 'yarn' : 'npm',
             type: workspace.type ?? 'commonjs',
             defaultEnv: workspace.travetto?.defaultEnv ?? 'local'
         },
         build: {
-            compilerFolder: build.compilerFolder ?? COMPILER_FOLDER,
-            compilerUrl: build.compilerUrl ?? getCompilerUrl(workspace),
-            compilerModuleFolder: workspace.stripRoot(path.dirname(workspace.resolve('@travetto/compiler/package.json'))),
-            outputFolder: build.outputFolder ?? OUTPUT_FOLDER,
-            toolFolder: build.toolFolder ?? TOOL_FOLDER,
-            typesFolder: build.typesFolder ?? TYPES_FOLDER
+            compilerUrl: build.compilerUrl ?? `http://localhost:${toPort(wsPrefix)}`,
+            compilerModuleFolder: toPosix(path.dirname(resolve('@travetto/compiler/package.json'))).replace(wsPrefix, ''),
+            compilerFolder: toPosix(build.compilerFolder ?? '.trv/compiler'),
+            outputFolder: toPosix(build.outputFolder ?? '.trv/output'),
+            toolFolder: toPosix(build.toolFolder ?? '.trv/tool'),
+            typesFolder: toPosix(build.typesFolder ?? '.trv/types')
         },
         main: {
-            name: mod.name ?? 'untitled',
-            folder: workspace.stripRoot(mod.path),
-            version: mod.version,
-            description: mod.description
+            name: modPkg.name ?? 'untitled',
+            folder: modPkg.path.replace(wsPrefix, ''),
+            version: modPkg.version,
+            description: modPkg.description
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/compiler",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "description": "The compiler infrastructure for the Travetto framework",
   "keywords": [
     "compiler",
@@ -33,12 +33,12 @@
   },
   "dependencies": {
     "@parcel/watcher": "^2.4.1",
-    "@travetto/manifest": "^5.0.5",
-    "@travetto/transformer": "^5.0.6",
+    "@travetto/manifest": "^5.0.6",
+    "@travetto/transformer": "^5.0.7",
     "@types/node": "^22.7.4"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.8"
+    "@travetto/cli": "^5.0.9"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/watch.ts

@@ -141,6 +141,7 @@ export class CompilerWatcher {
     const packageFiles = new Set(['package-lock.json', 'yarn.lock', 'package.json'].map(x => path.resolve(this.#root, x)));
 
     log.debug('Ignore Globs', ignore);
+    log.debug('Watching', this.#root);
 
     await this.#cleanup.workspace?.();