Skip to content

fix: generate .zenstack with the same level of @zenstackhq #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2023
Merged

fix: generate .zenstack with the same level of @zenstackhq #464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adec8ee
fix: generate .zenstack with the same level of @zenstackhq
jiashengguo Jun 5, 2023
e7be30a
fix: fix comments
jiashengguo Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/schema/src/plugins/plugin-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ export const ALL_OPERATION_KINDS: PolicyOperationKind[] = ['create', 'update', '
*/
export function getNodeModulesFolder(startPath?: string): string | undefined {
startPath = startPath ?? process.cwd();
if (fs.existsSync(path.join(startPath, 'node_modules'))) {
if (startPath.endsWith('node_modules')) {
return startPath;
} else if (fs.existsSync(path.join(startPath, 'node_modules'))) {
return path.join(startPath, 'node_modules');
} else if (startPath !== '/') {
const parent = path.join(startPath, '..');
Expand All @@ -25,7 +27,14 @@ export function getNodeModulesFolder(startPath?: string): string | undefined {
*/
export function getDefaultOutputFolder() {
// Find the real runtime module path, it might be a symlink in pnpm
const runtimeModulePath = require.resolve('@zenstackhq/runtime');
let runtimeModulePath = require.resolve('@zenstackhq/runtime');
if (runtimeModulePath) {
// start with the parent folder of @zenstackhq, supposed to be a node_modules folder
while (!runtimeModulePath.endsWith('@zenstackhq') && runtimeModulePath !== '/') {
runtimeModulePath = path.join(runtimeModulePath, '..');
}
runtimeModulePath = path.join(runtimeModulePath, '..');
}
const modulesFolder = getNodeModulesFolder(runtimeModulePath);
return modulesFolder ? path.join(modulesFolder, '.zenstack') : undefined;
}