@travetto/manifest 5.0.3 → 5.0.5

package/README.md

@@ -91,7 +91,8 @@ By default, all paths within the framework are assumed to be in a POSIX style, a
     "compilerUrl": "http://127.0.0.1:26803",
     "compilerModuleFolder": "module/compiler",
     "outputFolder": ".trv/output",
-    "toolFolder": ".trv/tool"
+    "toolFolder": ".trv/tool",
+    "typesFolder": ".trv/types"
   },
   "main": {
     "name": "@travetto/manifest",

package/package.json

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

package/src/context.ts

@@ -17,6 +17,7 @@ type Workspace = Pkg<{
 const TOOL_FOLDER = '.trv/tool';
 const COMPILER_FOLDER = '.trv/compiler';
 const OUTPUT_FOLDER = '.trv/output';
+const TYPES_FOLDER = '.trv/types';
 
 const WS_ROOT: Record<string, Workspace> = {};
 
@@ -52,14 +53,15 @@ function findPackage(dir: string): Pkg {
  * Get workspace root
  */
 function resolveWorkspace(base: string = process.cwd()): Workspace {
-  if (base in WS_ROOT) { return WS_ROOT[base]; }
+  if (base in WS_ROOT) {
+    return WS_ROOT[base];
+  }
   let folder = base;
-  let prev;
-  /** @type {Pkg|undefined} */
-  let prevPkg, pkg;
+  let prev: string | undefined;
+  let pkg: Pkg | undefined;
 
   while (prev !== folder) {
-    [prev, prevPkg] = [folder, pkg];
+    prev = folder;
     pkg = readPackage(folder) ?? pkg;
     if (
       (pkg && (!!pkg.workspaces || !!pkg.travetto?.build?.isolated)) || // if we have a monorepo root, or we are isolated
@@ -81,7 +83,7 @@ function resolveWorkspace(base: string = process.cwd()): Workspace {
     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 || (!pkg.travetto?.build?.isolated && !!prevPkg)  // Workspaces or nested projects
+    mono: !!pkg.workspaces
   };
 }
 
@@ -133,7 +135,6 @@ export function getManifestContext(folder?: string): ManifestContext {
   const workspace = resolveWorkspace();
   const mod = resolveModule(workspace, folder);
   const build = workspace.travetto?.build ?? {};
-  const toolFolder = build.toolFolder ?? TOOL_FOLDER;
 
   return {
     workspace: {
@@ -149,7 +150,8 @@ export function getManifestContext(folder?: string): ManifestContext {
       compilerUrl: build.compilerUrl ?? getCompilerUrl(workspace),
       compilerModuleFolder: workspace.stripRoot(path.dirname(workspace.resolve('@travetto/compiler/package.json'))),
       outputFolder: build.outputFolder ?? OUTPUT_FOLDER,
-      toolFolder
+      toolFolder: build.toolFolder ?? TOOL_FOLDER,
+      typesFolder: build.typesFolder ?? TYPES_FOLDER
     },
     main: {
       name: mod.name ?? 'untitled',

package/src/types/context.ts

@@ -26,6 +26,8 @@ export type ManifestContext = {
     outputFolder: string;
     /** Location of development-time tool output */
     toolFolder: string;
+    /** Location for type outputs */
+    typesFolder: string;
   };
   main: {
     /** Main module for manifest */

package/src/types/package.ts

@@ -46,6 +46,7 @@ export type Package = {
       isolated?: boolean;
       includes?: Record<string, 'main' | true>;
       watchIgnores?: string[];
+      typesFolder?: string;
     };
   };
   workspaces?: string[];