@contember/cli-common - npm Package Compare versions

Comparing version 1.0.0-rc.15 to 1.0.0-rc.16

dist/src/application/index.d.ts

@@ -7,2 +7,3 @@ export * from './Application';
 export * from './CommandConfiguration';
+export * from './env';
 export * from './Input';
@@ -9,0 +10,0 @@ export * from './InputParser';

dist/src/application/index.js

@@ -19,2 +19,3 @@ "use strict";
 __exportStar(require("./CommandConfiguration"), exports);
+__exportStar(require("./env"), exports);
 __exportStar(require("./Input"), exports);
@@ -21,0 +22,0 @@ __exportStar(require("./InputParser"), exports);

dist/src/utils/PathMapping.d.ts

 export declare type PathMapping = Record<string, string>;
-export declare const resolvePathMappingConfig: (baseDir: string, config?: PathMapping | undefined) => Promise<PathMapping>;
+export declare const resolvePathMappingConfig: (baseDir: string, defaultProjectName: string, config?: PathMapping | undefined) => Promise<PathMapping>;
 export declare const getPathFromMapping: (config: PathMapping, name: string) => string | undefined;
 export declare const listEntriesInMapping: (config: PathMapping) => Promise<string[]>;
 //# sourceMappingURL=PathMapping.d.ts.map

dist/src/utils/PathMapping.js

@@ -6,4 +6,3 @@ "use strict";
 const fs_1 = require("./fs");
-const resolvePathMappingConfig = async (baseDir, config) => {
-    var _a;
+const resolvePathMappingConfig = async (baseDir, defaultProjectName, config) => {
     if (config) {
@@ -13,6 +12,3 @@ return Object.fromEntries(Object.entries(config).map(([name, path]) => [name, (0, path_1.resolve)(baseDir, path)]));
     // single instance/project
-    const baseName = (_a = process.env.CONTEMBER_PROJECT_NAME) !== null && _a !== void 0 ? _a : (0, path_1.basename)(baseDir)
-        .toLocaleLowerCase()
-        .replace(/[^-_a-z0-9]/, '');
-    return { [baseName]: baseDir };
+    return { [defaultProjectName]: baseDir };
 };
@@ -19,0 +15,0 @@ exports.resolvePathMappingConfig = resolvePathMappingConfig;

dist/src/utils/ProjectManager.d.ts

@@ -16,3 +16,4 @@ import { Project } from './Project';
     private getProjectPathMapping;
+    private getDefaultProjectName;
 }
 //# sourceMappingURL=ProjectManager.d.ts.map

dist/src/utils/ProjectManager.js

@@ -62,6 +62,12 @@ "use strict";
     async getProjectPathMapping() {
-        return (0, PathMapping_1.resolvePathMappingConfig)(this.workspace.directory, this.workspace.config.projects);
+        return (0, PathMapping_1.resolvePathMappingConfig)(this.workspace.directory, this.getDefaultProjectName(), this.workspace.config.projects);
     }
+    getDefaultProjectName() {
+        var _a;
+        return (_a = this.workspace.env.projectName) !== null && _a !== void 0 ? _a : (0, path_1.basename)(this.workspace.directory)
+            .toLocaleLowerCase()
+            .replace(/[^-_a-z0-9]/, '');
+    }
 }
 exports.ProjectManager = ProjectManager;
 //# sourceMappingURL=ProjectManager.js.map

dist/src/utils/Workspace.d.ts

 import { ProjectManager } from './ProjectManager';
 import { PathMapping } from './PathMapping';
+import { CliEnv } from '../application';
 export interface WorkspaceDirectoryArgument {
@@ -24,5 +25,6 @@ workspaceDirectory: string;
     readonly directory: string;
+    readonly env: CliEnv;
     readonly config: WorkspaceConfig;
     readonly projects: ProjectManager;
-    constructor(directory: string, config: WorkspaceConfig);
+    constructor(directory: string, env: CliEnv, config: WorkspaceConfig);
     static get(workspaceDirectory: string): Promise<Workspace>;
@@ -29,0 +31,0 @@ get name(): string;

dist/src/utils/Workspace.js

@@ -10,2 +10,3 @@ "use strict";
 const yaml_1 = require("./yaml");
+const application_1 = require("../application");
 const createWorkspace = async ({ workspaceDirectory, workspaceName, template }) => {
@@ -22,4 +23,5 @@ template !== null && template !== void 0 ? template : (template = '@contember/template-workspace');
 class Workspace {
-    constructor(directory, config) {
+    constructor(directory, env, config) {
         this.directory = directory;
+        this.env = env;
         this.config = config;
@@ -30,3 +32,3 @@ this.projects = new ProjectManager_1.ProjectManager(this);
         const config = await readWorkspaceConfig({ workspaceDirectory });
-        return new Workspace(workspaceDirectory, config);
+        return new Workspace(workspaceDirectory, (0, application_1.readCliEnv)(), config);
     }
@@ -33,0 +35,0 @@ get name() {

package.json

 {
   "name": "@contember/cli-common",
-  "version": "1.0.0-rc.15",
+  "version": "1.0.0-rc.16",
   "license": "Apache-2.0",
@@ -16,3 +16,3 @@ "main": "dist/src/index.js",
   "dependencies": {
-    "@contember/config-loader": "^1.0.0-rc.15",
+    "@contember/config-loader": "^1.0.0-rc.16",
     "chalk": "^4.1.0",
@@ -19,0 +19,0 @@ "download-tarball": "^2.0.0",

src/application/index.ts

@@ -7,2 +7,3 @@ export * from './Application'
 export * from './CommandConfiguration'
+export * from './env'
 export * from './Input'
@@ -9,0 +10,0 @@ export * from './InputParser'

src/utils/PathMapping.ts

@@ -7,2 +7,3 @@ import { basename, join, resolve } from 'path'
 	baseDir: string,
+	defaultProjectName: string,
 	config?: PathMapping,
@@ -14,6 +15,3 @@ ): Promise<PathMapping> => {
 	// single instance/project
-	const baseName = process.env.CONTEMBER_PROJECT_NAME ?? basename(baseDir)
-		.toLocaleLowerCase()
-		.replace(/[^-_a-z0-9]/, '')
-	return { [baseName]: baseDir }
+	return { [defaultProjectName]: baseDir }
 }
@@ -20,0 +18,0 @@

src/utils/ProjectManager.ts

 import { Project, validateProjectName } from './Project'
-import { join } from 'path'
+import { basename, join } from 'path'
 import { Workspace } from './Workspace'
@@ -67,4 +67,12 @@ import { resourcesDir } from '../pathUtils'
 	private async getProjectPathMapping(): Promise<Record<string, string>> {
-		return resolvePathMappingConfig(this.workspace.directory, this.workspace.config.projects)
+		return resolvePathMappingConfig(this.workspace.directory, this.getDefaultProjectName(), this.workspace.config.projects)
 	}
+
+
+	private getDefaultProjectName(): string {
+		return this.workspace.env.projectName
+			?? basename(this.workspace.directory)
+				.toLocaleLowerCase()
+				.replace(/[^-_a-z0-9]/, '')
+	}
 }

src/utils/Workspace.ts

@@ -8,2 +8,3 @@ import { basename, join } from 'path'
 import { readYaml } from './yaml'
+import { CliEnv, readCliEnv } from '../application'
 
@@ -44,7 +45,11 @@ export interface WorkspaceDirectoryArgument {
 
-	constructor(public readonly directory: string, public readonly config: WorkspaceConfig) {}
+	constructor(
+		public readonly directory: string,
+		public readonly env: CliEnv,
+		public readonly config: WorkspaceConfig,
+	) {}
 
 	public static async get(workspaceDirectory: string) {
 		const config = await readWorkspaceConfig({ workspaceDirectory })
-		return new Workspace(workspaceDirectory, config)
+		return new Workspace(workspaceDirectory, readCliEnv(), config)
 	}
@@ -51,0 +56,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

148469

increased by2.03%

Number of package files

161

increased by3.21%

Lines of code

2127

increased by2.56%

Number of low supply chain risk alerts

9

decreased by-10%

Dependency changes

• Updated@contember/config-loader@^1.0.0-rc.16