@travetto/manifest 7.0.4 → 7.1.0

package/README.md

@@ -55,8 +55,7 @@ By default, all paths within the framework are assumed to be in a POSIX style, a
     "name": "@travetto/mono-repo",
     "path": "<generated>",
     "mono": true,
-    "manager": "npm",
-    "defaultEnv": "local"
+    "manager": "npm"
   },
   "build": {
     "compilerUrl": "http://127.0.0.1:26803",
@@ -73,7 +72,7 @@ By default, all paths within the framework are assumed to be in a POSIX style, a
   "modules": {
     "@travetto/manifest": {
       "main": true,
-      "prod": true,
+      "production": true,
       "name": "@travetto/manifest",
       "version": "x.x.x",
       "workspace": true,
@@ -141,7 +140,7 @@ The context contains:
    *  The framework version (based on @travetto/manifest)
 
 ### Modules
-The modules represent all of the [Travetto](https://travetto.dev)-aware dependencies (including dev dependencies) used for compiling, testing and executing.  A prod-only version is produced when packaging the final output. Each module contains:
+The modules represent all of the [Travetto](https://travetto.dev)-aware dependencies (including dev dependencies) used for compiling, testing and executing.  A production-only version is produced when packaging the final output. Each module contains:
    *  The dependency npm name
    *  The dependency version
    *  A flag to determine if its a local module

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/manifest",
-  "version": "7.0.4",
+  "version": "7.1.0",
   "type": "module",
   "description": "Support for project indexing, manifesting, along with file watching",
   "keywords": [

package/src/context.ts

@@ -64,8 +64,7 @@ export function getManifestContext(root: string = process.cwd()): ManifestContex
       name: workspace.name ?? 'untitled',
       path: workspace.path,
       mono: !!workspace.workspaces,
-      manager: existsSync(path.resolve(workspace.path, 'yarn.lock')) ? 'yarn' : 'npm',
-      defaultEnv: workspace.travetto?.defaultEnv ?? 'local'
+      manager: existsSync(path.resolve(workspace.path, 'yarn.lock')) ? 'yarn' : 'npm'
     },
     build: {
       compilerUrl: build.compilerUrl ?? `http://localhost:${toPort(wsPrefix)}`,

package/src/dependencies.ts

@@ -5,7 +5,7 @@ import type { Package, PackageDependencyType } from './types/package.ts';
 import type { ManifestContext } from './types/context.ts';
 import type { PackageModule } from './types/manifest.ts';
 
-type CreateOpts = Partial<Pick<PackageModule, 'main' | 'workspace' | 'prod'>> & { roleRoot?: boolean, parent?: PackageModule };
+type CreateOpts = Partial<Pick<PackageModule, 'main' | 'workspace' | 'production'>> & { roleRoot?: boolean, parent?: PackageModule };
 
 type VisitableNode = {
   /** Request package */
@@ -43,11 +43,11 @@ export class PackageModuleVisitor {
   /**
    * Build a package module
    */
-  #create(sourcePath: string, { main, workspace, prod = false, roleRoot = false, parent }: CreateOpts = {}): VisitableNode {
+  #create(sourcePath: string, { main, workspace, production = false, roleRoot = false, parent }: CreateOpts = {}): VisitableNode {
     const pkg = PackageUtil.readPackage(sourcePath);
     const value = this.#cache[sourcePath] ??= {
       main,
-      prod,
+      production,
       name: pkg.name,
       version: pkg.version,
       workspace: workspace ?? (pkg.name in this.#workspaceModules),
@@ -56,7 +56,7 @@ export class PackageModuleVisitor {
       outputFolder: `node_modules/${pkg.name}`,
       state: {
         childSet: new Set(), parentSet: new Set(), roleSet: new Set(), roleRoot,
-        travetto: pkg.travetto, prodDependencies: new Set(Object.keys(pkg.dependencies ?? {}))
+        travetto: pkg.travetto, dependencies: new Set(Object.keys(pkg.dependencies ?? {}))
       }
     };
 
@@ -98,7 +98,7 @@ export class PackageModuleVisitor {
   }
 
   /**
-   * Propagate prod, role information through graph
+   * Propagate production, role information through graph
    */
   async #complete(modules: Iterable<PackageModule>): Promise<PackageModule[]> {
     const mapping = new Map([...modules].map(item => [item.name, { parent: new Set(item.state.parentSet), item }]));
@@ -132,8 +132,8 @@ export class PackageModuleVisitor {
               child.item.state.roleSet.add(role);
             }
           }
-          // Allow prod to trickle down as needed
-          child.item.prod ||= (item.prod && item.state.prodDependencies.has(childName));
+          // Allow production to trickle down as needed
+          child.item.production ||= (item.production && item.state.dependencies.has(childName));
         }
       }
       // Remove from mapping
@@ -155,7 +155,7 @@ export class PackageModuleVisitor {
    */
   async visit(): Promise<Iterable<PackageModule>> {
     const seen = new Set<PackageModule>();
-    const mainRequire = this.#create(this.#mainSourcePath, { main: true, workspace: true, roleRoot: true, prod: true });
+    const mainRequire = this.#create(this.#mainSourcePath, { main: true, workspace: true, roleRoot: true, production: true });
 
     const queue = [
       mainRequire,

package/src/package.ts

@@ -119,11 +119,11 @@ export class PackageUtil {
   /**
    * Get an install command for a given npm module
    */
-  static getInstallCommand(ctx: { workspace: { manager: NodePackageManager } }, pkg: string, prod = false): string {
+  static getInstallCommand(ctx: { workspace: { manager: NodePackageManager } }, pkg: string, production = false): string {
     let install: string;
     switch (ctx.workspace.manager) {
-      case 'npm': install = `npm i ${prod ? '' : '--save-dev '}${pkg}`; break;
-      case 'yarn': install = `yarn add ${prod ? '' : '--dev '}${pkg}`; break;
+      case 'npm': install = `npm i ${production ? '' : '--save-dev '}${pkg}`; break;
+      case 'yarn': install = `yarn add ${production ? '' : '--dev '}${pkg}`; break;
     }
     return install;
   }

package/src/types/context.ts

@@ -10,8 +10,6 @@ export type ManifestContext = {
     mono?: boolean;
     /** The package manager of the workspace */
     manager: NodePackageManager;
-    /** The default env name */
-    defaultEnv: string;
   };
   build: {
     /** URL for the compiler server */

package/src/types/manifest.ts

@@ -15,8 +15,8 @@ export type ManifestDepCore = {
   main?: boolean;
   /** Is this a module that is part of the workspace */
   workspace?: boolean;
-  /** Should this module be deployed to prod? */
-  prod: boolean;
+  /** Should this module be deployed to production? */
+  production: boolean;
   /** Is the module intended to be published? */
   internal?: boolean;
 };
@@ -69,8 +69,8 @@ export type PackageModule = Omit<ManifestModule, 'files' | 'parents' | 'roles'>
     roleRoot?: boolean;
     /** Travetto package info */
     travetto?: Package['travetto'];
-    /** Prod dependencies */
-    prodDependencies: Set<string>;
+    /** Production dependencies */
+    dependencies: Set<string>;
     /** Set of parent package names */
     parentSet: Set<string>;
     /** Set of child package names */

package/src/types/package.ts

@@ -40,7 +40,6 @@ export type Package = {
       baseUrl?: string;
       outputs?: string[];
     };
-    defaultEnv?: string;
     workspaceInclude?: boolean;
     build?: Partial<ManifestContext['build']> & {
       isolated?: boolean;

package/src/util.ts

@@ -37,8 +37,8 @@ export class ManifestUtil {
    * Produce a production manifest from a given manifest
    */
   static createProductionManifest(manifest: ManifestRoot): ManifestRoot {
-    const prodModules = Object.values(manifest.modules).filter(module => module.prod);
-    const prodModNames = new Set([...prodModules.map(module => module.name)]);
+    const modules = Object.values(manifest.modules).filter(module => module.production);
+    const moduleNames = new Set([...modules.map(module => module.name)]);
     return {
       generated: manifest.generated,
       workspace: manifest.workspace,
@@ -49,8 +49,8 @@ export class ManifestUtil {
       },
       main: manifest.main,
       modules: Object.fromEntries(
-        prodModules.map(module => [module.name, Object.assign(module, {
-          parents: module.parents.filter(parent => prodModNames.has(parent))
+        modules.map(module => [module.name, Object.assign(module, {
+          parents: module.parents.filter(parent => moduleNames.has(parent))
         })])
       ),
     };