zenstack 2.8.1 → 2.9.0

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 (61) hide show
  1. package/cli/cli-util.js +7 -5
  2. package/cli/cli-util.js.map +1 -1
  3. package/cli/plugin-runner.js +3 -1
  4. package/cli/plugin-runner.js.map +1 -1
  5. package/language-server/utils.d.ts +5 -1
  6. package/language-server/utils.js +7 -0
  7. package/language-server/utils.js.map +1 -1
  8. package/language-server/validator/attribute-application-validator.js +3 -0
  9. package/language-server/validator/attribute-application-validator.js.map +1 -1
  10. package/language-server/validator/function-invocation-validator.js +1 -1
  11. package/language-server/validator/function-invocation-validator.js.map +1 -1
  12. package/language-server/validator/schema-validator.js +2 -1
  13. package/language-server/validator/schema-validator.js.map +1 -1
  14. package/language-server/validator/typedef-validator.d.ts +1 -0
  15. package/language-server/validator/typedef-validator.js +4 -0
  16. package/language-server/validator/typedef-validator.js.map +1 -1
  17. package/language-server/validator/utils.d.ts +1 -5
  18. package/language-server/validator/utils.js +0 -65
  19. package/language-server/validator/utils.js.map +1 -1
  20. package/language-server/zmodel-linker.js +10 -9
  21. package/language-server/zmodel-linker.js.map +1 -1
  22. package/language-server/zmodel-scope.d.ts +2 -2
  23. package/language-server/zmodel-scope.js +35 -27
  24. package/language-server/zmodel-scope.js.map +1 -1
  25. package/package.json +4 -4
  26. package/plugins/enhancer/enhance/auth-type-generator.d.ts +2 -2
  27. package/plugins/enhancer/enhance/auth-type-generator.js +4 -4
  28. package/plugins/enhancer/enhance/auth-type-generator.js.map +1 -1
  29. package/plugins/enhancer/enhance/index.d.ts +7 -3
  30. package/plugins/enhancer/enhance/index.js +109 -77
  31. package/plugins/enhancer/enhance/index.js.map +1 -1
  32. package/plugins/enhancer/enhance/model-typedef-generator.js +2 -1
  33. package/plugins/enhancer/enhance/model-typedef-generator.js.map +1 -1
  34. package/plugins/enhancer/index.js +2 -2
  35. package/plugins/enhancer/index.js.map +1 -1
  36. package/plugins/enhancer/policy/policy-guard-generator.d.ts +1 -1
  37. package/plugins/enhancer/policy/policy-guard-generator.js +23 -35
  38. package/plugins/enhancer/policy/policy-guard-generator.js.map +1 -1
  39. package/plugins/enhancer/policy/utils.js +15 -12
  40. package/plugins/enhancer/policy/utils.js.map +1 -1
  41. package/plugins/plugin-utils.d.ts +1 -1
  42. package/plugins/plugin-utils.js +5 -3
  43. package/plugins/plugin-utils.js.map +1 -1
  44. package/plugins/prisma/index.js +18 -1
  45. package/plugins/prisma/index.js.map +1 -1
  46. package/plugins/prisma/schema-generator.d.ts +0 -1
  47. package/plugins/prisma/schema-generator.js +40 -60
  48. package/plugins/prisma/schema-generator.js.map +1 -1
  49. package/plugins/zod/generator.d.ts +2 -0
  50. package/plugins/zod/generator.js +77 -19
  51. package/plugins/zod/generator.js.map +1 -1
  52. package/plugins/zod/transformer.d.ts +3 -2
  53. package/plugins/zod/transformer.js +31 -10
  54. package/plugins/zod/transformer.js.map +1 -1
  55. package/plugins/zod/utils/schema-gen.d.ts +1 -2
  56. package/plugins/zod/utils/schema-gen.js +0 -40
  57. package/plugins/zod/utils/schema-gen.js.map +1 -1
  58. package/res/stdlib.zmodel +3 -3
  59. package/utils/ast-utils.d.ts +5 -7
  60. package/utils/ast-utils.js +8 -43
  61. package/utils/ast-utils.js.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"zmodel-linker.js","sourceRoot":"","sources":["../../src/language-server/zmodel-linker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAoCkC;AAClC,yCAAwG;AACxG,qCAciB;AACjB,2CAAmC;AACnC,mDAAmD;AACnD,kDAAgG;AAChG,6CAAmE;AASnE;;GAEG;AACH,MAAa,YAAa,SAAQ,uBAAa;IAG3C,YAAY,QAAyB;QACjC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAAC;IACtE,CAAC;IAED,2BAA2B;IAErB,IAAI;6DAAC,QAAyB,EAAE,WAAW,GAAG,kCAAiB,CAAC,IAAI;;YACtE,IAAI,CAAA,MAAA,QAAQ,CAAC,WAAW,CAAC,WAAW,0CAAE,MAAM,IAAG,CAAC,IAAI,CAAA,MAAA,QAAQ,CAAC,WAAW,CAAC,YAAY,0CAAE,MAAM,IAAG,CAAC,EAAE,CAAC;gBAChG,OAAO;YACX,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,IAAA,wBAAc,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;gBACrC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACjC,CAAC;YACD,QAAQ,CAAC,KAAK,GAAG,uBAAa,CAAC,MAAM,CAAC;QAC1C,CAAC;KAAA;IAEO,aAAa,CACjB,SAAkB,EAClB,QAAgB,EAChB,QAAyB,EACzB,WAA4B;QAE5B,IAAI,IAAI,CAAC,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;YAC7E,OAAO;QACX,CAAC;QAED,8DAA8D;QAC9D,MAAM,SAAS,GAAsB,SAAiB,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,YAAY;IAEZ,mCAAmC;IAE3B,yBAAyB,CAC7B,IAAa,EACb,QAAgB,EAChB,QAAyB,EACzB,SAA0B;QAE1B,8DAA8D;QAC9D,MAAM,SAAS,GAAsB,IAAY,CAAC,QAAQ,CAAC,CAAC;QAC5D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC5C,IAAI,MAAM,EAAE,CAAC;gBACT,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC;gBACxB,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAEhG,0DAA0D;gBAC1D,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEpC,OAAO,MAAM,CAAC;YAClB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,OAAO,CAAC,IAAa,EAAE,QAAyB,EAAE,cAA+B,EAAE;QACvF,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,KAAK,mBAAa,CAAC;YACnB,KAAK,mBAAa,CAAC;YACnB,KAAK,oBAAc;gBACf,IAAI,CAAC,cAAc,CAAC,IAAmB,CAAC,CAAC;gBACzC,MAAM;YAEV,KAAK,oBAAc;gBACf,IAAI,CAAC,iBAAiB,CAAC,IAAsB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACtE,MAAM;YAEV,KAAK,eAAS;gBACV,IAAI,CAAC,YAAY,CAAC,IAAiB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC5D,MAAM;YAEV,KAAK,mBAAa;gBACd,IAAI,CAAC,gBAAgB,CAAC,IAAqB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACpE,MAAM;YAEV,KAAK,sBAAgB;gBACjB,IAAI,CAAC,mBAAmB,CAAC,IAAwB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1E,MAAM;YAEV,KAAK,eAAS;gBACV,IAAI,CAAC,YAAY,CAAC,IAAiB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC5D,MAAM;YAEV,KAAK,gBAAU;gBACX,IAAI,CAAC,aAAa,CAAC,IAAkB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC9D,MAAM;YAEV,KAAK,gBAAU;gBACX,IAAI,CAAC,aAAa,CAAC,IAAkB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC9D,MAAM;YAEV,KAAK,cAAQ;gBACT,IAAI,CAAC,WAAW,CAAC,IAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1D,MAAM;YAEV,KAAK,cAAQ;gBACT,IAAI,CAAC,WAAW,CAAC,IAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1D,MAAM;YAEV,KAAK,kBAAY;gBACb,IAAI,CAAC,mBAAmB,CAAC,IAAoB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACtE,MAAM;YAEV,KAAK,eAAS;gBACV,IAAI,CAAC,gBAAgB,CAAC,IAAiB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAChE,MAAM;YAEV,KAAK,oBAAc;gBACf,IAAI,CAAC,qBAAqB,CAAC,IAAsB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1E,MAAM;YAEV;gBACI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACjD,MAAM;QACd,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,IAAgB,EAAE,QAAkC,EAAE,WAA4B;QACpG,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,6BAA6B;YAC7B,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,sDAAsD;YACtD,uDAAuD;YACvD,oDAAoD;YACpD,aAAa;YAEb,KAAK,GAAG,CAAC;YACT,KAAK,IAAI,CAAC;YACV,KAAK,GAAG,CAAC;YACT,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI;gBACL,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAChD,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACjD,MAAM;YAEV,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACJ,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC7D,MAAM;YAEV;gBACI,MAAM,KAAK,CAAC,gCAAgC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,IAAe,EAAE,QAAkC,EAAE,WAA4B;QAClG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAClD,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,KAAK,GAAG;gBACJ,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACjD,MAAM;YACV;gBACI,MAAM,KAAK,CAAC,+BAA+B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,IAAgB,EAAE,QAAkC,EAAE,WAA4B;QACpG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAEO,gBAAgB,CAAC,IAAmB,EAAE,QAAkC,EAAE,WAA4B;QAC1G,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEjD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAClB,eAAe;YACf,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,KAAK,eAAS,EAAE,CAAC;gBACtC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACtE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAG,IAAI,CAAC,MAAM,CAAC,GAAsC,CAAC,IAAI,CAAC,CAAC;YAC/F,CAAC;QACL,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,IAAe,EAAE,QAAkC,EAAE,WAA4B;QAClG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YAC7C,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC/D,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,IAAoB,EAAE,QAAyB,EAAE,WAA4B;QACnG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;QACrE,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YACpB,wDAAwD;YACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAmB,CAAC;YACnD,IAAI,IAAA,sBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,yEAAyE;gBAEzE,0DAA0D;gBAC1D,MAAM,aAAa,GAAG,IAAA,8CAAkC,EACpD,IAAI,CAAC,gBAAgB,EAAE,EACvB,IAAA,4BAAkB,EAAC,IAAI,EAAE,iBAAW,CAAC,CACxC,CAAC;gBAEF,MAAM,SAAS,GAAG,IAAA,kBAAY,EAAC,aAAa,CAAC,CAAC;gBAC9C,IAAI,SAAS,EAAE,CAAC;oBACZ,IAAI,CAAC,aAAa,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAC7D,CAAC;YACL,CAAC;iBAAM,IAAI,IAAA,kBAAY,EAAC,IAAI,CAAC,EAAE,CAAC;gBAC5B,iDAAiD;gBACjD,IAAI,CAAC,aAAa,GAAG,EAAE,IAAI,EAAE,IAAA,kCAAsB,EAAC,IAAI,CAAC,EAAE,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC1D,CAAC;QACL,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,IAAiB;QACpC,MAAM,IAAI,GAAG,IAAA,kBAAK,EAA8B,IAAI,CAAC;aAChD,IAAI,CAAC,qBAAe,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;aACrC,IAAI,CAAC,sBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC;aACvC,IAAI,CAAC,qBAAe,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;aAClC,UAAU,EAAE,CAAC;QAElB,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAEO,mBAAmB,CACvB,IAAsB,EACtB,QAAkC,EAClC,WAA4B;QAE5B,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACjD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;QAEnD,IAAI,eAAe,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,IAAA,iBAAW,EAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YACjF,oEAAoE;YACpE,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBAClB,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAEvD,IAAI,IAAI,CAAC,aAAa,IAAI,IAAA,sBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvD,+CAA+C;oBAC/C,gDAAgD;oBAChD,IAAI,CAAC,aAAa,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACvC,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAEO,0BAA0B,CAAC,IAAgB,EAAE,QAAyB,EAAE,WAA4B;QACxG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAEjD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;QAC7C,IAAI,YAAY,IAAI,IAAA,iBAAW,EAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;YACvE,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,uCAAuC;QAC3C,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,IAAc,EAAE,SAAmC,EAAE,WAA4B;QACjG,4BAA4B;QAC5B,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YACxB,IAAI,IAAA,iBAAW,EAAC,CAAC,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACzC,OAAO;YACX,CAAC;QACL,CAAC;QAED,IAAI,IAAI,GAAwB,IAAI,CAAC,UAAU,CAAC;QAEhD,OAAO,IAAI,IAAI,CAAC,IAAA,iBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;YAChC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,IAAc,EAAE,SAAmC,EAAE,YAA6B;QAClG,oCAAoC;QACpC,IAAI,CAAC,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAEO,mBAAmB,CAAC,IAAkB,EAAE,QAAkC,EAAE,WAA4B;;QAC5G,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAEjD,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,IAAI,MAAK,0BAA0B,IAAI,IAAA,sBAAgB,EAAC,aAAa,CAAC,EAAE,CAAC;YACzF,6FAA6F;YAC7F,iCAAiC;YACjC,EAAE;YACF,QAAQ;YACR,EAAE;YACF,YAAY;YACZ,oBAAoB;YACpB,IAAI;YACJ,EAAE;YACF,YAAY;YACZ,kBAAkB;YAClB,oDAAoD;YACpD,IAAI;YACJ,EAAE;YACF,uFAAuF;YAEvF,MAAM,mBAAmB,GAAG,MAAA,aAAa,CAAC,IAAI,CAAC,SAAS,0CAAE,GAAgB,CAAC;YAC3E,IAAI,mBAAmB,EAAE,CAAC;gBACtB,iEAAiE;gBACjE,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CACnC,IAAA,6BAAuB,EAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBAC9E,IAAI,IAAA,iBAAW,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBAC9B,IAAI,IAAA,qBAAe,EAAC,IAAI,CAAC,EAAE,CAAC;4BACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;4BAC3F,IAAI,QAAQ,EAAE,CAAC;gCACX,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAG,QAA2B,CAAC,IAAI,CAAC,CAAC;4BACxE,CAAC;iCAAM,CAAC;gCACJ,oBAAoB;gCACpB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;4BACnC,CAAC;wBACL,CAAC;oBACL,CAAC,CAAC,CAAC;oBACH,IAAI,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,0CAAE,aAAa,0CAAE,IAAI,EAAE,CAAC;wBAC3C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC9F,CAAC;gBACL,CAAC;qBAAM,IAAI,IAAA,qBAAe,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;oBACjG,IAAI,QAAQ,EAAE,CAAC;wBACX,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAG,QAA2B,CAAC,IAAI,CAAC,CAAC;oBAC9E,CAAC;yBAAM,CAAC;wBACJ,oBAAoB;wBACpB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACzC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IAClD,CAAC;IAEO,mBAAmB,CAAC,IAAmB;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,MAA0B,CAAC;QAC5C,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC;YAC/B,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,QAAQ;SACrB,CAAC,CAAC;IACP,CAAC;IAEO,mBAAmB,CAAC,GAAiB;;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACX,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,IAAe,EAAE,QAAkC,EAAE,WAA4B;QACtG,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAEO,qBAAqB,CACzB,IAAoB,EACpB,QAAkC,EAClC,WAA4B;QAE5B,0FAA0F;QAC1F,uFAAuF;QACvF,wFAAwF;QACxF,wCAAwC;QACxC,EAAE;QACF,mBAAmB;QACnB,SAAS;QACT,SAAS;QACT,IAAI;;QAEJ,qBAAqB;QACrB,SAAS;QACT,SAAS;QACT,SAAS;QACT,IAAI;QAEJ,YAAY;QACZ,iBAAiB;QACjB,qEAAqE;QACrE,mEAAmE;QACnE,IAAI;QACJ,EAAE;QAEF,mCAAmC;QACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAE/C,IAAI,MAAM,GAAG,WAAW,CAAC;QAEzB,wGAAwG;QACxG,IAAI,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,SAAS,0CAAE,GAAG,KAAI,IAAA,YAAM,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAW,CAAC;YACpD,MAAM,SAAS,GAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC3F,MAAM,GAAG,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAEO,cAAc,CAAC,IAAa,EAAE,QAAkC,EAAE,WAA4B;QAClG,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,IAAI,IAAA,qBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC9D,CAAC;YACL,CAAC;QACL,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,IAAA,wBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAED,YAAY;IAEZ,eAAe;IAEP,qBAAqB,CAAC,IAAa,EAAE,IAA4C;QACrF,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,IAAA,0BAAoB,EAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAEzB,4CAA4C;YAC5C,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,IAAI,CAAC,aAAa,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;gBAC1E,OAAO;YACX,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,IAAA,sCAA8B,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACrF,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG;gBACjB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG;gBACxB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,QAAQ;aACrB,CAAC;QACN,CAAC;IACL,CAAC;IAEO,0BAA0B,CAAC,IAAa,EAAE,IAAmB,EAAE,KAAK,GAAG,KAAK,EAAE,QAAQ,GAAG,KAAK;QAClG,IAAI,CAAC,aAAa,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IACzD,CAAC;CAGJ;AA5dD,oCA4dC"}
1
+ {"version":3,"file":"zmodel-linker.js","sourceRoot":"","sources":["../../src/language-server/zmodel-linker.ts"],"names":[],"mappings":"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"}
@@ -17,6 +17,6 @@ export declare class ZModelScopeProvider extends DefaultScopeProvider {
17
17
  private getMemberAccessScope;
18
18
  private getCollectionPredicateScope;
19
19
  private createScopeForContainingModel;
20
- private createScopeForModel;
21
- private createScopeForAuthModel;
20
+ private createScopeForContainer;
21
+ private createScopeForAuth;
22
22
  }
@@ -16,6 +16,7 @@ const langium_1 = require("langium");
16
16
  const ts_pattern_1 = require("ts-pattern");
17
17
  const ast_utils_1 = require("../utils/ast-utils");
18
18
  const constants_1 = require("./constants");
19
+ const utils_1 = require("./validator/utils");
19
20
  /**
20
21
  * Custom Langium ScopeComputation implementation which adds enum fields into global scope
21
22
  */
@@ -98,24 +99,28 @@ class ZModelScopeProvider extends langium_1.DefaultScopeProvider {
98
99
  const referenceType = this.reflection.getReferenceType(context);
99
100
  const globalScope = this.getGlobalScope(referenceType, context);
100
101
  const node = context.container;
102
+ // typedef's fields are only added to the scope if the access starts with `auth().`
103
+ // or the member access resides inside a typedef
104
+ const allowTypeDefScope = (0, utils_1.isAuthOrAuthMemberAccess)(node.operand) || !!(0, langium_1.getContainerOfType)(node, ast_1.isTypeDef);
101
105
  return (0, ts_pattern_1.match)(node.operand)
102
106
  .when(ast_1.isReferenceExpr, (operand) => {
103
107
  var _a;
104
- // operand is a reference, it can only be a model field
108
+ // operand is a reference, it can only be a model/type-def field
105
109
  const ref = operand.target.ref;
106
- if ((0, ast_1.isDataModelField)(ref)) {
107
- const targetModel = (_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref;
108
- return this.createScopeForModel(targetModel, globalScope);
110
+ if ((0, ast_1.isDataModelField)(ref) || (0, ast_1.isTypeDefField)(ref)) {
111
+ return this.createScopeForContainer((_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref, globalScope, allowTypeDefScope);
109
112
  }
110
113
  return langium_1.EMPTY_SCOPE;
111
114
  })
112
115
  .when(ast_1.isMemberAccessExpr, (operand) => {
113
- var _a;
114
- // operand is a member access, it must be resolved to a non-array data model type
116
+ var _a, _b;
117
+ // operand is a member access, it must be resolved to a non-array model/typedef type
115
118
  const ref = operand.member.ref;
116
119
  if ((0, ast_1.isDataModelField)(ref) && !ref.type.array) {
117
- const targetModel = (_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref;
118
- return this.createScopeForModel(targetModel, globalScope);
120
+ return this.createScopeForContainer((_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref, globalScope, allowTypeDefScope);
121
+ }
122
+ if ((0, ast_1.isTypeDefField)(ref) && !ref.type.array) {
123
+ return this.createScopeForContainer((_b = ref.type.reference) === null || _b === void 0 ? void 0 : _b.ref, globalScope, allowTypeDefScope);
119
124
  }
120
125
  return langium_1.EMPTY_SCOPE;
121
126
  })
@@ -126,8 +131,8 @@ class ZModelScopeProvider extends langium_1.DefaultScopeProvider {
126
131
  .when(ast_1.isInvocationExpr, (operand) => {
127
132
  // deal with member access from `auth()` and `future()
128
133
  if ((0, sdk_1.isAuthInvocation)(operand)) {
129
- // resolve to `User` or `@@auth` model
130
- return this.createScopeForAuthModel(node, globalScope);
134
+ // resolve to `User` or `@@auth` decl
135
+ return this.createScopeForAuth(node, globalScope);
131
136
  }
132
137
  if ((0, ast_utils_1.isFutureInvocation)(operand)) {
133
138
  // resolve `future()` to the containing model
@@ -141,55 +146,58 @@ class ZModelScopeProvider extends langium_1.DefaultScopeProvider {
141
146
  const referenceType = this.reflection.getReferenceType(context);
142
147
  const globalScope = this.getGlobalScope(referenceType, context);
143
148
  const collection = collectionPredicate.left;
149
+ // typedef's fields are only added to the scope if the access starts with `auth().`
150
+ const allowTypeDefScope = (0, utils_1.isAuthOrAuthMemberAccess)(collection);
144
151
  return (0, ts_pattern_1.match)(collection)
145
152
  .when(ast_1.isReferenceExpr, (expr) => {
146
153
  var _a;
147
- // collection is a reference, it can only be a model field
154
+ // collection is a reference - model or typedef field
148
155
  const ref = expr.target.ref;
149
- if ((0, ast_1.isDataModelField)(ref)) {
150
- const targetModel = (_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref;
151
- return this.createScopeForModel(targetModel, globalScope);
156
+ if ((0, ast_1.isDataModelField)(ref) || (0, ast_1.isTypeDefField)(ref)) {
157
+ return this.createScopeForContainer((_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref, globalScope, allowTypeDefScope);
152
158
  }
153
159
  return langium_1.EMPTY_SCOPE;
154
160
  })
155
161
  .when(ast_1.isMemberAccessExpr, (expr) => {
156
162
  var _a;
157
- // collection is a member access, it can only be resolved to a model field
163
+ // collection is a member access, it can only be resolved to a model or typedef field
158
164
  const ref = expr.member.ref;
159
- if ((0, ast_1.isDataModelField)(ref)) {
160
- const targetModel = (_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref;
161
- return this.createScopeForModel(targetModel, globalScope);
165
+ if ((0, ast_1.isDataModelField)(ref) || (0, ast_1.isTypeDefField)(ref)) {
166
+ return this.createScopeForContainer((_a = ref.type.reference) === null || _a === void 0 ? void 0 : _a.ref, globalScope, allowTypeDefScope);
162
167
  }
163
168
  return langium_1.EMPTY_SCOPE;
164
169
  })
165
170
  .when(sdk_1.isAuthInvocation, (expr) => {
166
- return this.createScopeForAuthModel(expr, globalScope);
171
+ return this.createScopeForAuth(expr, globalScope);
167
172
  })
168
173
  .otherwise(() => langium_1.EMPTY_SCOPE);
169
174
  }
170
175
  createScopeForContainingModel(node, globalScope) {
171
176
  const model = (0, langium_1.getContainerOfType)(node, ast_1.isDataModel);
172
177
  if (model) {
173
- return this.createScopeForModel(model, globalScope);
178
+ return this.createScopeForContainer(model, globalScope);
174
179
  }
175
180
  else {
176
181
  return langium_1.EMPTY_SCOPE;
177
182
  }
178
183
  }
179
- createScopeForModel(node, globalScope) {
184
+ createScopeForContainer(node, globalScope, includeTypeDefScope = false) {
180
185
  if ((0, ast_1.isDataModel)(node)) {
181
186
  return this.createScopeForNodes((0, sdk_1.getModelFieldsWithBases)(node), globalScope);
182
187
  }
188
+ else if (includeTypeDefScope && (0, ast_1.isTypeDef)(node)) {
189
+ return this.createScopeForNodes(node.fields, globalScope);
190
+ }
183
191
  else {
184
192
  return langium_1.EMPTY_SCOPE;
185
193
  }
186
194
  }
187
- createScopeForAuthModel(node, globalScope) {
188
- // get all data models from loaded and reachable documents
189
- const allDataModels = (0, ast_utils_1.getAllLoadedAndReachableDataModels)(this.services.shared.workspace.LangiumDocuments, (0, langium_1.getContainerOfType)(node, ast_1.isDataModel));
190
- const authModel = (0, sdk_1.getAuthModel)(allDataModels);
191
- if (authModel) {
192
- return this.createScopeForModel(authModel, globalScope);
195
+ createScopeForAuth(node, globalScope) {
196
+ // get all data models and type defs from loaded and reachable documents
197
+ const decls = (0, ast_utils_1.getAllLoadedAndReachableDataModelsAndTypeDefs)(this.services.shared.workspace.LangiumDocuments, (0, langium_1.getContainerOfType)(node, ast_1.isDataModel));
198
+ const authDecl = (0, sdk_1.getAuthDecl)(decls);
199
+ if (authDecl) {
200
+ return this.createScopeForContainer(authDecl, globalScope, true);
193
201
  }
194
202
  else {
195
203
  return langium_1.EMPTY_SCOPE;
@@ -1 +1 @@
1
- {"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":"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"}
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.8.1",
6
+ "version": "2.9.0",
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.8.1",
109
- "@zenstackhq/sdk": "2.8.1"
108
+ "@zenstackhq/language": "2.9.0",
109
+ "@zenstackhq/sdk": "2.9.0"
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.8.1"
130
+ "@zenstackhq/runtime": "2.9.0"
131
131
  },
132
132
  "scripts": {
133
133
  "vscode:publish": "vsce publish --no-dependencies",
@@ -1,6 +1,6 @@
1
- import { DataModel, type Model } from '@zenstackhq/sdk/ast';
1
+ import { DataModel, TypeDef, type Model } from '@zenstackhq/sdk/ast';
2
2
  /**
3
3
  * Generate types for typing the `user` context object passed to the `enhance` call, based
4
4
  * on the fields (potentially deeply) access through `auth()`.
5
5
  */
6
- export declare function generateAuthType(model: Model, authModel: DataModel): string;
6
+ export declare function generateAuthType(model: Model, authDecl: DataModel | TypeDef): string;
@@ -9,9 +9,9 @@ const ast_utils_1 = require("../../../utils/ast-utils");
9
9
  * Generate types for typing the `user` context object passed to the `enhance` call, based
10
10
  * on the fields (potentially deeply) access through `auth()`.
11
11
  */
12
- function generateAuthType(model, authModel) {
12
+ function generateAuthType(model, authDecl) {
13
13
  const types = new Map();
14
- types.set(authModel.name, { requiredRelations: [] });
14
+ types.set(authDecl.name, { requiredRelations: [] });
15
15
  const ensureType = (model) => {
16
16
  if (!types.has(model)) {
17
17
  types.set(model, { requiredRelations: [] });
@@ -69,9 +69,9 @@ function generateAuthType(model, authModel) {
69
69
  ${Array.from(types.entries())
70
70
  .map(([model, fields]) => {
71
71
  let result = `Partial<_P.${model}>`;
72
- if (model === authModel.name) {
72
+ if (model === authDecl.name) {
73
73
  // auth model's id fields are always required
74
- const idFields = (0, sdk_1.getIdFields)(authModel).map((f) => f.name);
74
+ const idFields = (0, sdk_1.getIdFields)(authDecl).map((f) => f.name);
75
75
  if (idFields.length > 0) {
76
76
  result = `WithRequired<${result}, ${idFields.map((f) => `'${f}'`).join('|')}>`;
77
77
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-type-generator.js","sourceRoot":"","sources":["../../../../src/plugins/enhancer/enhance/auth-type-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-type-generator.js","sourceRoot":"","sources":["../../../../src/plugins/enhancer/enhance/auth-type-generator.ts"],"names":[],"mappings":"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"}
@@ -7,9 +7,11 @@ export declare class EnhancerGenerator {
7
7
  private readonly options;
8
8
  private readonly project;
9
9
  private readonly outDir;
10
+ private readonly modelsWithAuthInDefaultCreateInputPattern;
10
11
  constructor(model: Model, options: PluginOptions, project: Project, outDir: string);
11
12
  generate(): Promise<{
12
13
  dmmf: DMMF.Document | undefined;
14
+ newPrismaClientDtsPath: string | undefined;
13
15
  }>;
14
16
  private getZodImport;
15
17
  private createSimplePrismaImports;
@@ -17,7 +19,6 @@ export declare class EnhancerGenerator {
17
19
  private createLogicalPrismaImports;
18
20
  private createLogicalPrismaEnhanceFunction;
19
21
  private get needsLogicalClient();
20
- private get needsPrismaClientTypeFixes();
21
22
  private hasDelegateModel;
22
23
  private hasAuthInDefault;
23
24
  private hasTypeDef;
@@ -29,17 +30,20 @@ export declare class EnhancerGenerator {
29
30
  private transformVariableStatement;
30
31
  private transformInterface;
31
32
  private transformTypeAlias;
32
- private fixJsonFieldType;
33
33
  private fixDelegatePayloadType;
34
34
  private removeCreateFromDelegateInput;
35
35
  private removeDiscriminatorFromConcreteInput;
36
36
  private removeAuxFieldsFromTypeAlias;
37
37
  private readonly CreateUpdateWithoutDelegateRelationRegex;
38
38
  private removeDelegateFieldsFromNestedMutationInput;
39
+ private fixDefaultAuthType;
40
+ private fixJsonFieldType;
41
+ private generateExtraTypes;
39
42
  private findNamedProperty;
40
43
  private findAuxDecls;
41
44
  private getDiscriminatorField;
42
45
  private saveSourceFile;
43
46
  private get generatePermissionChecker();
44
- private generateExtraTypes;
47
+ private removeFromSource;
48
+ private trimEmptyLines;
45
49
  }