fix: issue with locating .zenstack package (#1157)

zenstackhq · Mar 19, 2024 · 13f8c73 · 13f8c73
1 parent aa8b182
commit 13f8c73
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/packages/schema/src/plugins/plugin-utils.ts b/packages/schema/src/plugins/plugin-utils.ts
@@ -3,7 +3,6 @@ import { PluginGlobalOptions } from '@zenstackhq/sdk';
 import fs from 'fs';
 import path from 'path';
 import { PluginRunnerOptions } from '../cli/plugin-runner';
-import { getPackageManager } from '../utils/pkg-utils';
 
 export const ALL_OPERATION_KINDS: PolicyOperationKind[] = ['create', 'update', 'postUpdate', 'read', 'delete'];
 
@@ -82,27 +81,17 @@ export function getDefaultOutputFolder(globalOptions?: PluginGlobalOptions) {
         return path.join(process.cwd(), 'node_modules', DEFAULT_RUNTIME_LOAD_PATH);
     }
 
-    const { projectRoot } = getPackageManager(__dirname);
-    if (fs.existsSync(path.join(projectRoot, 'node_modules'))) {
-        // use the located node_modules folder
-        return path.join(projectRoot, 'node_modules', DEFAULT_RUNTIME_LOAD_PATH);
-    } else {
-        // unable to locate a node_modules folder, fallback to where the runtime
-        // package resides
-
-        // find the real runtime module path, it might be a symlink in pnpm
-        let runtimeModulePath = require.resolve('@zenstackhq/runtime');
+    // find the real runtime module path, it might be a symlink in pnpm
+    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, DEFAULT_RUNTIME_LOAD_PATH) : undefined;
+    // 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, DEFAULT_RUNTIME_LOAD_PATH) : undefined;
 }
 
 /**

diff --git a/packages/server/src/shared.ts b/packages/server/src/shared.ts
@@ -33,7 +33,11 @@ export function getDefaultModelMeta(loadPath: string | undefined): ModelMeta {
             const toLoad = path.resolve(loadPath, 'model-meta');
             return require(toLoad).default;
         } else {
-            return require('.zenstack/model-meta').default;
+            // model-meta should be resolved relative to the runtime
+            const metaPath = require.resolve('.zenstack/model-meta', {
+                paths: [require.resolve('@zenstackhq/runtime')],
+            });
+            return require(metaPath).default;
         }
     } catch {
         if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
@@ -61,7 +65,11 @@ export function getDefaultPolicy(loadPath: string | undefined): PolicyDef {
             const toLoad = path.resolve(loadPath, 'policy');
             return require(toLoad).default;
         } else {
-            return require('.zenstack/policy').default;
+            // policy should be resolved relative to the runtime
+            const policyPath = require.resolve('.zenstack/policy', {
+                paths: [require.resolve('@zenstackhq/runtime')],
+            });
+            return require(policyPath).default;
         }
     } catch {
         if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
@@ -92,7 +100,11 @@ export function getDefaultZodSchemas(loadPath: string | undefined): ZodSchemas |
             const toLoad = path.resolve(loadPath, 'zod');
             return require(toLoad);
         } else {
-            return require('.zenstack/zod');
+            // policy should be resolved relative to the runtime
+            const zodPath = require.resolve('.zenstack/zod', {
+                paths: [require.resolve('@zenstackhq/runtime')],
+            });
+            return require(zodPath);
         }
     } catch {
         if (process.env.ZENSTACK_TEST === '1' && !loadPath) {