@zenstackhq/runtime 1.0.0-beta.22 → 1.0.0-beta.24

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.
Files changed (3) hide show
  1. package/loader.js +27 -14
  2. package/loader.js.map +1 -1
  3. package/package.json +1 -1
package/loader.js CHANGED
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getDefaultZodSchemas = exports.getDefaultPolicy = exports.getDefaultModelMeta = void 0;
7
7
  /* eslint-disable @typescript-eslint/no-var-requires */
8
8
  const path_1 = __importDefault(require("path"));
9
- const constants_1 = require("./constants");
10
9
  /**
11
10
  * Load model metadata.
12
11
  *
@@ -14,16 +13,20 @@ const constants_1 = require("./constants");
14
13
  * will use default load path.
15
14
  */
16
15
  function getDefaultModelMeta(loadPath) {
17
- const toLoad = loadPath ? path_1.default.resolve(loadPath, 'model-meta') : `${constants_1.DEFAULT_RUNTIME_LOAD_PATH}/model-meta`;
18
16
  try {
19
- // normal load
20
- return require(toLoad).default;
17
+ if (loadPath) {
18
+ const toLoad = path_1.default.resolve(loadPath, 'model-meta');
19
+ return require(toLoad).default;
20
+ }
21
+ else {
22
+ return require('.zenstack/model-meta').default;
23
+ }
21
24
  }
22
25
  catch (_a) {
23
- if (process.env.ZENSTACK_TEST === '1' && !path_1.default.isAbsolute(toLoad)) {
26
+ if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
24
27
  try {
25
28
  // special handling for running as tests, try resolving relative to CWD
26
- return require(path_1.default.join(process.cwd(), 'node_modules', toLoad)).default;
29
+ return require(path_1.default.join(process.cwd(), 'node_modules', '.zenstack', 'model-meta')).default;
27
30
  }
28
31
  catch (_b) {
29
32
  throw new Error('Model meta cannot be loaded. Please make sure "zenstack generate" has been run.');
@@ -40,15 +43,20 @@ exports.getDefaultModelMeta = getDefaultModelMeta;
40
43
  * will use default load path.
41
44
  */
42
45
  function getDefaultPolicy(loadPath) {
43
- const toLoad = loadPath ? path_1.default.resolve(loadPath, 'policy') : `${constants_1.DEFAULT_RUNTIME_LOAD_PATH}/policy`;
44
46
  try {
45
- return require(toLoad).default;
47
+ if (loadPath) {
48
+ const toLoad = path_1.default.resolve(loadPath, 'policy');
49
+ return require(toLoad).default;
50
+ }
51
+ else {
52
+ return require('.zenstack/policy').default;
53
+ }
46
54
  }
47
55
  catch (_a) {
48
- if (process.env.ZENSTACK_TEST === '1' && !path_1.default.isAbsolute(toLoad)) {
56
+ if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
49
57
  try {
50
58
  // special handling for running as tests, try resolving relative to CWD
51
- return require(path_1.default.join(process.cwd(), 'node_modules', toLoad)).default;
59
+ return require(path_1.default.join(process.cwd(), 'node_modules', '.zenstack', 'policy')).default;
52
60
  }
53
61
  catch (_b) {
54
62
  throw new Error('Policy definition cannot be loaded from default location. Please make sure "zenstack generate" has been run.');
@@ -65,15 +73,20 @@ exports.getDefaultPolicy = getDefaultPolicy;
65
73
  * will use default load path.
66
74
  */
67
75
  function getDefaultZodSchemas(loadPath) {
68
- const toLoad = loadPath ? path_1.default.resolve(loadPath, 'zod') : `${constants_1.DEFAULT_RUNTIME_LOAD_PATH}/zod`;
69
76
  try {
70
- return require(toLoad);
77
+ if (loadPath) {
78
+ const toLoad = path_1.default.resolve(loadPath, 'zod');
79
+ return require(toLoad);
80
+ }
81
+ else {
82
+ return require('.zenstack/zod');
83
+ }
71
84
  }
72
85
  catch (_a) {
73
- if (process.env.ZENSTACK_TEST === '1' && !path_1.default.isAbsolute(toLoad)) {
86
+ if (process.env.ZENSTACK_TEST === '1' && !loadPath) {
74
87
  try {
75
88
  // special handling for running as tests, try resolving relative to CWD
76
- return require(path_1.default.join(process.cwd(), 'node_modules', toLoad));
89
+ return require(path_1.default.join(process.cwd(), 'node_modules', '.zenstack', 'zod'));
77
90
  }
78
91
  catch (_b) {
79
92
  return undefined;
package/loader.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,gDAAwB;AACxB,2CAAwD;AAGxD;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,QAA4B;IAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,qCAAyB,aAAa,CAAC;IAC3G,IAAI;QACA,cAAc;QACd,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;KAClC;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/D,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;aAC5E;YAAC,WAAM;gBACJ,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;aACtG;SACJ;QACD,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;KACtG;AACL,CAAC;AAhBD,kDAgBC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAA4B;IACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,qCAAyB,SAAS,CAAC;IACnG,IAAI;QACA,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;KAClC;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/D,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;aAC5E;YAAC,WAAM;gBACJ,MAAM,IAAI,KAAK,CACX,8GAA8G,CACjH,CAAC;aACL;SACJ;QACD,MAAM,IAAI,KAAK,CACX,8GAA8G,CACjH,CAAC;KACL;AACL,CAAC;AAnBD,4CAmBC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,QAA4B;IAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,qCAAyB,MAAM,CAAC;IAC7F,IAAI;QACA,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;KAC1B;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/D,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;aACpE;YAAC,WAAM;gBACJ,OAAO,SAAS,CAAC;aACpB;SACJ;QACD,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAfD,oDAeC"}
1
+ {"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,gDAAwB;AAGxB;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,QAA4B;IAC5D,IAAI;QACA,IAAI,QAAQ,EAAE;YACV,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACpD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;SAClC;aAAM;YACH,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC;SAClD;KACJ;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE;YAChD,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;aAC/F;YAAC,WAAM;gBACJ,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;aACtG;SACJ;QACD,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;KACtG;AACL,CAAC;AAnBD,kDAmBC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAA4B;IACzD,IAAI;QACA,IAAI,QAAQ,EAAE;YACV,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAChD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;SAClC;aAAM;YACH,OAAO,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC;SAC9C;KACJ;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE;YAChD,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;aAC3F;YAAC,WAAM;gBACJ,MAAM,IAAI,KAAK,CACX,8GAA8G,CACjH,CAAC;aACL;SACJ;QACD,MAAM,IAAI,KAAK,CACX,8GAA8G,CACjH,CAAC;KACL;AACL,CAAC;AAvBD,4CAuBC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,QAA4B;IAC7D,IAAI;QACA,IAAI,QAAQ,EAAE;YACV,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;SAC1B;aAAM;YACH,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;SACnC;KACJ;IAAC,WAAM;QACJ,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE;YAChD,IAAI;gBACA,uEAAuE;gBACvE,OAAO,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;aAChF;YAAC,WAAM;gBACJ,OAAO,SAAS,CAAC;aACpB;SACJ;QACD,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAnBD,oDAmBC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@zenstackhq/runtime",
3
3
  "displayName": "ZenStack Runtime Library",
4
- "version": "1.0.0-beta.22",
4
+ "version": "1.0.0-beta.24",
5
5
  "description": "Runtime of ZenStack for both client-side and server-side environments.",
6
6
  "repository": {
7
7
  "type": "git",