zenstack 2.9.0 → 2.9.1

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": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
6
- "version": "2.9.0",
6
+ "version": "2.9.1",
7
7
  "author": {
8
8
  "name": "ZenStack Team"
9
9
  },
@@ -105,8 +105,8 @@
105
105
  "vscode-uri": "^3.0.6",
106
106
  "zod": "^3.22.4",
107
107
  "zod-validation-error": "^1.5.0",
108
- "@zenstackhq/language": "2.9.0",
109
- "@zenstackhq/sdk": "2.9.0"
108
+ "@zenstackhq/sdk": "2.9.1",
109
+ "@zenstackhq/language": "2.9.1"
110
110
  },
111
111
  "peerDependencies": {
112
112
  "prisma": "5.0.0 - 5.22.x"
@@ -127,7 +127,7 @@
127
127
  "tmp": "^0.2.1",
128
128
  "tsc-alias": "^1.7.0",
129
129
  "vitest": "^0.29.7",
130
- "@zenstackhq/runtime": "2.9.0"
130
+ "@zenstackhq/runtime": "2.9.1"
131
131
  },
132
132
  "scripts": {
133
133
  "vscode:publish": "vsce publish --no-dependencies",
@@ -79,14 +79,22 @@ const run = (model, options, _dmmf, _globalOptions) => __awaiter(void 0, void 0,
79
79
  clientOutputDir = prismaClientPath;
80
80
  }
81
81
  // get PrismaClient dts path
82
- try {
83
- const prismaClientResolvedPath = require.resolve(clientOutputDir, {
84
- paths: [path_1.default.dirname(options.schemaPath)],
85
- });
86
- prismaClientDtsPath = path_1.default.join(path_1.default.dirname(prismaClientResolvedPath), 'index.d.ts');
82
+ if (clientOutput) {
83
+ // if a custom prisma client output path is configured, first try treating
84
+ // clientOutputDir as a relative path and locate the index.d.ts file
85
+ prismaClientDtsPath = path_1.default.resolve(path_1.default.dirname(options.schemaPath), clientOutputDir, 'index.d.ts');
87
86
  }
88
- catch (err) {
89
- console.warn(colors_1.default.yellow(`Could not resolve PrismaClient type declaration path. This may break plugins that depend on it.`));
87
+ if (!prismaClientDtsPath || !fs_1.default.existsSync(prismaClientDtsPath)) {
88
+ // if the file does not exist, try node module resolution
89
+ try {
90
+ const prismaClientResolvedPath = require.resolve(clientOutputDir, {
91
+ paths: [path_1.default.dirname(options.schemaPath)],
92
+ });
93
+ prismaClientDtsPath = path_1.default.join(path_1.default.dirname(prismaClientResolvedPath), 'index.d.ts');
94
+ }
95
+ catch (err) {
96
+ console.warn(colors_1.default.yellow(`Could not resolve PrismaClient type declaration path. This may break plugins that depend on it.`));
97
+ }
90
98
  }
91
99
  }
92
100
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/prisma/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/prisma/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AA4IA,wDASC;AArJD,yCAOyB;AACzB,6CAAqE;AACrE,mDAAiD;AACjD,oDAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AACxB,8DAAqC;AACrC,gEAAwC;AACxC,uDAAqD;AACrD,qDAA+C;AAC/C,yDAA2D;AAE9C,QAAA,IAAI,GAAG,QAAQ,CAAC;AAChB,QAAA,WAAW,GAAG,0BAA0B,CAAC;AAEtD,MAAM,GAAG,GAAmB,CAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACxE,uDAAuD;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM;QACzB,CAAC,CAAC,IAAA,iBAAW,EAAC,OAAO,CAAC,MAAgB,EAAE,OAAO,CAAC;QAChD,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAErD,MAAM,aAAa,GAAG,gCAAK,OAAO,KAAE,MAAM,GAA8B,CAAC;IACzE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,wCAAqB,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAElG,4CAA4C;IAC5C,IAAI,gBAAgB,GAAG,gBAAgB,CAAC;IAExC,sDAAsD;IACtD,IAAI,eAAe,GAAG,gBAAgB,CAAC;IAEvC,yCAAyC;IACzC,IAAI,mBAAmB,GAAuB,SAAS,CAAC;IAExD,IAAI,OAAO,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QACnC,IAAI,WAAW,GAAG,6BAA6B,MAAM,GAAG,CAAC;QACzD,IAAI,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC3C,WAAW,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC;YACD,wBAAwB;YACxB,MAAM,IAAA,wBAAW,EAAC,WAAW,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,CAAC;QAAC,WAAM,CAAC;YACL,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC;gBACD,yDAAyD;gBACzD,MAAM,IAAA,wBAAW,EAAC,WAAW,CAAC,CAAC;YACnC,CAAC;YAAC,WAAM,CAAC;gBACL,OAAO;YACX,CAAC;YACD,MAAM,IAAI,iBAAW,CAAC,YAAI,EAAE,iCAAiC,CAAC,CAAC;QACnE,CAAC;QAED,kDAAkD;QAClD,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CACrC,CAAC,CAAC,EAAsB,EAAE,CACtB,IAAA,qBAAe,EAAC,CAAC,CAAC;YAClB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,IAAA,gBAAU,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,kBAAkB,CAAC,CAChG,CAAC;QACF,MAAM,iBAAiB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAC7E,MAAM,YAAY,GAAG,IAAA,gBAAU,EAAS,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,KAAK,CAAC,CAAC;QAElE,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,cAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChC,gBAAgB,GAAG,YAAY,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACJ,0DAA0D;gBAC1D,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;gBAEjE,sDAAsD;gBACtD,gBAAgB,GAAG,IAAA,wBAAkB,EAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;YACrF,CAAC;YAED,+DAA+D;YAC/D,eAAe,GAAG,gBAAgB,CAAC;QACvC,CAAC;QAED,4BAA4B;QAE5B,IAAI,YAAY,EAAE,CAAC;YACf,0EAA0E;YAC1E,oEAAoE;YACpE,mBAAmB,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;QACxG,CAAC;QAED,IAAI,CAAC,mBAAmB,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC9D,yDAAyD;YACzD,IAAI,CAAC;gBACD,MAAM,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC9D,KAAK,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;iBAC5C,CAAC,CAAC;gBACH,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE,YAAY,CAAC,CAAC;YAC1F,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CACR,gBAAM,CAAC,MAAM,CACT,iGAAiG,CACpG,CACJ,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,IAAI,CACR,gBAAM,CAAC,MAAM,CACT,sIAAsI,CACzI,CACJ,CAAC;IACN,CAAC;IAED,uBAAuB;IACvB,MAAM,IAAI,GAAG,MAAM,IAAA,gBAAO,EAAC;QACvB,SAAS,EAAE,YAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC;KAC9C,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,YAAY,EAAE,CAAC;AACnF,CAAC,CAAA,CAAC;AAEF,SAAS,0BAA0B,CAAC,UAAkB;;IAClD,oCAAoC;IACpC,MAAM,WAAW,GAAG,IAAA,kBAAM,EAAC,CAAC,cAAc,CAAC,EAAE,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE,CAAC;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAClE,IAAI,OAAO,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,MAAM,CAAA,KAAK,QAAQ,EAAE,CAAC;YAChD,IAAI,cAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,mCAAmC;gBACnC,OAAO,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5E,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,IAAA,iBAAW,EAAC,wBAAwB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,SAAsB,sBAAsB,CAAC,MAAc;;QACvD,IAAI,CAAC;YACD,MAAM,IAAA,gBAAO,EAAC,EAAE,SAAS,EAAE,YAAE,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACvB,8DAA8D;gBAC9D,mBAAS,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,qBAAU,EAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/F,CAAC;QACL,CAAC;IACL,CAAC;CAAA;AAED,kBAAe,GAAG,CAAC"}