@zenstackhq/server 2.0.0-beta.1 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zenstackhq/server",
3
- "version": "2.0.0-beta.1",
3
+ "version": "2.0.0-beta.2",
4
4
  "displayName": "ZenStack Server-side Adapters",
5
5
  "description": "ZenStack server-side adapters",
6
6
  "homepage": "https://zenstack.dev",
@@ -27,7 +27,7 @@
27
27
  "url-pattern": "^1.0.3",
28
28
  "zod": "^3.22.4",
29
29
  "zod-validation-error": "^1.5.0",
30
- "@zenstackhq/runtime": "2.0.0-beta.1"
30
+ "@zenstackhq/runtime": "2.0.0-beta.2"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@sveltejs/kit": "1.21.0",
@@ -44,7 +44,7 @@
44
44
  "next": "^13.4.5",
45
45
  "nuxt": "^3.7.4",
46
46
  "supertest": "^6.3.3",
47
- "@zenstackhq/testtools": "2.0.0-beta.1"
47
+ "@zenstackhq/testtools": "2.0.0-beta.2"
48
48
  },
49
49
  "exports": {
50
50
  "./package.json": "./package.json",
package/shared.js CHANGED
@@ -38,7 +38,11 @@ function getDefaultModelMeta(loadPath) {
38
38
  return require(toLoad).default;
39
39
  }
40
40
  else {
41
- return require('.zenstack/model-meta').default;
41
+ // model-meta should be resolved relative to the runtime
42
+ const metaPath = require.resolve('.zenstack/model-meta', {
43
+ paths: [require.resolve('@zenstackhq/runtime')],
44
+ });
45
+ return require(metaPath).default;
42
46
  }
43
47
  }
44
48
  catch (_a) {
@@ -69,7 +73,11 @@ function getDefaultPolicy(loadPath) {
69
73
  return require(toLoad).default;
70
74
  }
71
75
  else {
72
- return require('.zenstack/policy').default;
76
+ // policy should be resolved relative to the runtime
77
+ const policyPath = require.resolve('.zenstack/policy', {
78
+ paths: [require.resolve('@zenstackhq/runtime')],
79
+ });
80
+ return require(policyPath).default;
73
81
  }
74
82
  }
75
83
  catch (_a) {
@@ -99,7 +107,11 @@ function getDefaultZodSchemas(loadPath) {
99
107
  return require(toLoad);
100
108
  }
101
109
  else {
102
- return require('.zenstack/zod');
110
+ // policy should be resolved relative to the runtime
111
+ const zodPath = require.resolve('.zenstack/zod', {
112
+ paths: [require.resolve('@zenstackhq/runtime')],
113
+ });
114
+ return require(zodPath);
103
115
  }
104
116
  }
105
117
  catch (_a) {
package/shared.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"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"}