feat: update pathUpToWorkspaces

packages/@yarn-tool/dotenv/index.ts

@@ -47,7 +47,6 @@ export function wsEnvConfig<E = typeof process.env>(cwd?: string, options?: IDot
 
 	for (current of pathUpToWorkspacesGenerator(cwd))
 	{
-
 		for (let file of files)
 		{
 			path = join(current, file);

packages/@yarn-tool/path-parents/index.d.ts

@@ -1,5 +1,6 @@
-export declare function pathUpToWorkspacesGenerator(cwd?: string, options?: {
+export interface IOptions {
     ignoreCurrentDirectory?: boolean;
-}): Generator<string, void, unknown>;
-export declare function pathUpToWorkspaces(cwd?: string): string[];
+}
+export declare function pathUpToWorkspacesGenerator(cwd?: string, options?: IOptions): Generator<string, void, unknown>;
+export declare function pathUpToWorkspaces(cwd?: string, options?: IOptions): string[];
 export default pathUpToWorkspaces;

packages/@yarn-tool/path-parents/index.ts

@@ -1,18 +1,16 @@
 import { handleOptions, pathParentsGenerator } from 'path-parents';
 import { findRoot } from '@yarn-tool/find-root';
 import { resolve } from 'upath2';
-import pathIsSame from 'path-is-same';
+import { pathIsSame } from 'path-is-same';
 
-export function* pathUpToWorkspacesGenerator(cwd?: string, options?: {
-	ignoreCurrentDirectory?: boolean
-})
+export interface IOptions
 {
-	cwd = resolve(cwd ?? process.cwd())
+	ignoreCurrentDirectory?: boolean;
+}
 
-	if (!options?.ignoreCurrentDirectory)
-	{
-		yield cwd
-	}
+export function* pathUpToWorkspacesGenerator(cwd?: string, options?: IOptions)
+{
+	cwd = resolve(cwd ?? process.cwd())
 
 	let {
 		root,
@@ -22,7 +20,12 @@ export function* pathUpToWorkspacesGenerator(cwd?: string, options?: {
 		cwd,
 	});
 
-	if (hasWorkspace && !isWorkspace)
+	if (!options?.ignoreCurrentDirectory)
+	{
+		yield cwd
+	}
+
+	if (root.length && !pathIsSame(cwd, root))
 	{
 		for (let current of pathParentsGenerator(cwd))
 		{
@@ -39,9 +42,9 @@ export function* pathUpToWorkspacesGenerator(cwd?: string, options?: {
 	}
 }
 
-export function pathUpToWorkspaces(cwd?: string)
+export function pathUpToWorkspaces(cwd?: string, options?: IOptions)
 {
-	return [...pathUpToWorkspacesGenerator(cwd)]
+	return [...pathUpToWorkspacesGenerator(cwd, options)]
 }
 
 export default pathUpToWorkspaces

packages/@yarn-tool/path-parents/test/lazy.spec.ts

@@ -1,5 +1,7 @@
 import pathUpToWorkspaces from '../index';
 import __ from 'lodash/fp/__';
+import { join } from 'path';
+import { findRootLazy } from '@yarn-tool/find-root';
 
 describe(`describe`, () =>
 {
@@ -8,9 +10,35 @@ describe(`describe`, () =>
 	{
 
 		let actual = pathUpToWorkspaces(__dirname);
-		let expected;
 
-		expect(actual.length).toBeGreaterThan(0);
+		expect(actual.length).toBeGreaterThan(2);
+
+		actual = pathUpToWorkspaces(__dirname, {
+			ignoreCurrentDirectory: true,
+		});
+
+		expect(actual.length).toBeGreaterThan(2);
+
+	});
+
+})
+
+describe(`ws.root`, () =>
+{
+	let rootData = findRootLazy();
+	let cwd = rootData.root;
+
+	test(`test`, () =>
+	{
+		let actual = pathUpToWorkspaces(cwd);
+
+		expect(actual.length).toStrictEqual(1);
+
+		actual = pathUpToWorkspaces(cwd, {
+			ignoreCurrentDirectory: true,
+		});
+
+		expect(actual.length).toStrictEqual(0);
 
 	});