zenstack 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
@@ -3,7 +3,7 @@
3
3
  "publisher": "zenstack",
4
4
  "displayName": "ZenStack Language Tools",
5
5
  "description": "Build scalable web apps with minimum code by defining authorization and validation rules inside the data schema that closer to the database",
6
- "version": "2.0.0-beta.1",
6
+ "version": "2.0.0-beta.2",
7
7
  "author": {
8
8
  "name": "ZenStack Team"
9
9
  },
@@ -94,8 +94,8 @@
94
94
  "vscode-uri": "^3.0.6",
95
95
  "zod": "^3.22.4",
96
96
  "zod-validation-error": "^1.5.0",
97
- "@zenstackhq/language": "2.0.0-beta.1",
98
- "@zenstackhq/sdk": "2.0.0-beta.1"
97
+ "@zenstackhq/language": "2.0.0-beta.2",
98
+ "@zenstackhq/sdk": "2.0.0-beta.2"
99
99
  },
100
100
  "devDependencies": {
101
101
  "@prisma/client": "^5.7.1",
@@ -114,7 +114,7 @@
114
114
  "tmp": "^0.2.1",
115
115
  "tsc-alias": "^1.7.0",
116
116
  "vitest": "^0.29.7",
117
- "@zenstackhq/runtime": "2.0.0-beta.1"
117
+ "@zenstackhq/runtime": "2.0.0-beta.2"
118
118
  },
119
119
  "scripts": {
120
120
  "vscode:publish": "vsce publish --no-dependencies",
@@ -7,7 +7,6 @@ exports.CorePlugins = exports.getDefaultOutputFolder = exports.ensureDefaultOutp
7
7
  const runtime_1 = require("@zenstackhq/runtime");
8
8
  const fs_1 = __importDefault(require("fs"));
9
9
  const path_1 = __importDefault(require("path"));
10
- const pkg_utils_1 = require("../utils/pkg-utils");
11
10
  exports.ALL_OPERATION_KINDS = ['create', 'update', 'postUpdate', 'read', 'delete'];
12
11
  /**
13
12
  * Gets the nearest "node_modules" folder by walking up from start path.
@@ -84,26 +83,15 @@ function getDefaultOutputFolder(globalOptions) {
84
83
  if (process.env.ZENSTACK_TEST === '1') {
85
84
  return path_1.default.join(process.cwd(), 'node_modules', runtime_1.DEFAULT_RUNTIME_LOAD_PATH);
86
85
  }
87
- const { projectRoot } = (0, pkg_utils_1.getPackageManager)(__dirname);
88
- if (fs_1.default.existsSync(path_1.default.join(projectRoot, 'node_modules'))) {
89
- // use the located node_modules folder
90
- return path_1.default.join(projectRoot, 'node_modules', runtime_1.DEFAULT_RUNTIME_LOAD_PATH);
91
- }
92
- else {
93
- // unable to locate a node_modules folder, fallback to where the runtime
94
- // package resides
95
- // find the real runtime module path, it might be a symlink in pnpm
96
- let runtimeModulePath = require.resolve('@zenstackhq/runtime');
97
- if (runtimeModulePath) {
98
- // start with the parent folder of @zenstackhq, supposed to be a node_modules folder
99
- while (!runtimeModulePath.endsWith('@zenstackhq') && runtimeModulePath !== '/') {
100
- runtimeModulePath = path_1.default.join(runtimeModulePath, '..');
101
- }
102
- runtimeModulePath = path_1.default.join(runtimeModulePath, '..');
103
- }
104
- const modulesFolder = getNodeModulesFolder(runtimeModulePath);
105
- return modulesFolder ? path_1.default.join(modulesFolder, runtime_1.DEFAULT_RUNTIME_LOAD_PATH) : undefined;
86
+ // find the real runtime module path, it might be a symlink in pnpm
87
+ let runtimeModulePath = require.resolve('@zenstackhq/runtime');
88
+ // start with the parent folder of @zenstackhq, supposed to be a node_modules folder
89
+ while (!runtimeModulePath.endsWith('@zenstackhq') && runtimeModulePath !== '/') {
90
+ runtimeModulePath = path_1.default.join(runtimeModulePath, '..');
106
91
  }
92
+ runtimeModulePath = path_1.default.join(runtimeModulePath, '..');
93
+ const modulesFolder = getNodeModulesFolder(runtimeModulePath);
94
+ return modulesFolder ? path_1.default.join(modulesFolder, runtime_1.DEFAULT_RUNTIME_LOAD_PATH) : undefined;
107
95
  }
108
96
  exports.getDefaultOutputFolder = getDefaultOutputFolder;
109
97
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../src/plugins/plugin-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../src/plugins/plugin-utils.ts"],"names":[],"mappings":"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"}