@zenstackhq/sdk 3.0.0-beta.22 → 3.0.0-beta.24

package/dist/index.d.cts

@@ -99,6 +99,7 @@ declare class PrismaSchemaGenerator {
     private configInvocationArgToText;
     private literalToText;
     private generateGenerator;
+    private generateDefaultGenerator;
     private generateModel;
     private getDatasourceField;
     private datasourceHasSchemasSetting;
@@ -127,6 +128,7 @@ type TsSchemaGeneratorOptions = {
     outDir: string;
     lite?: boolean;
     liteOnly?: boolean;
+    importWithFileExtension?: string;
 };
 declare class TsSchemaGenerator {
     private usedExpressionUtils;
@@ -163,6 +165,7 @@ declare class TsSchemaGenerator {
     private createEnumObject;
     private getLiteral;
     private createLiteralNode;
+    private createNumberLiteral;
     private createProceduresObject;
     private createProcedureObject;
     private generateBannerComments;

package/dist/index.d.ts

@@ -99,6 +99,7 @@ declare class PrismaSchemaGenerator {
     private configInvocationArgToText;
     private literalToText;
     private generateGenerator;
+    private generateDefaultGenerator;
     private generateModel;
     private getDatasourceField;
     private datasourceHasSchemasSetting;
@@ -127,6 +128,7 @@ type TsSchemaGeneratorOptions = {
     outDir: string;
     lite?: boolean;
     liteOnly?: boolean;
+    importWithFileExtension?: string;
 };
 declare class TsSchemaGenerator {
     private usedExpressionUtils;
@@ -163,6 +165,7 @@ declare class TsSchemaGenerator {
     private createEnumObject;
     private getLiteral;
     private createLiteralNode;
+    private createNumberLiteral;
     private createProceduresObject;
     private createProcedureObject;
     private generateBannerComments;

package/dist/index.js

@@ -104,7 +104,7 @@ var DELEGATE_AUX_RELATION_PREFIX = "delegate_aux";
 // src/prisma/prisma-schema-generator.ts
 import { lowerCaseFirst } from "@zenstackhq/common-helpers";
 import { ZModelCodeGenerator } from "@zenstackhq/language";
-import { BooleanLiteral, DataModel, DataSource as DataSource2, Enum as Enum2, GeneratorDecl, isArrayExpr, isDataModel as isDataModel2, isDataSource, isInvocationExpr, isLiteralExpr as isLiteralExpr2, isNullExpr, isReferenceExpr, isStringLiteral, isTypeDef as isTypeDef2, NumberLiteral, StringLiteral } from "@zenstackhq/language/ast";
+import { BooleanLiteral, DataModel, DataSource as DataSource2, Enum as Enum2, GeneratorDecl, isArrayExpr, isDataModel as isDataModel2, isDataSource, isGeneratorDecl, isInvocationExpr, isLiteralExpr as isLiteralExpr2, isNullExpr, isReferenceExpr, isStringLiteral, isTypeDef as isTypeDef2, NumberLiteral, StringLiteral } from "@zenstackhq/language/ast";
 import { getAllAttributes, getAllFields as getAllFields2, getStringLiteral, isAuthInvocation, isDelegateModel as isDelegateModel2 } from "@zenstackhq/language/utils";
 import { AstUtils } from "langium";
 import { match } from "ts-pattern";
@@ -538,6 +538,9 @@ var PrismaSchemaGenerator = class {
           break;
       }
     }
+    if (!this.zmodel.declarations.some(isGeneratorDecl)) {
+      this.generateDefaultGenerator(prisma);
+    }
     return this.PRELUDE + prisma.toString();
   }
   generateDataSource(prisma, dataSource) {
@@ -578,6 +581,21 @@ var PrismaSchemaGenerator = class {
       text: this.configExprToText(f.value)
     })));
   }
+  generateDefaultGenerator(prisma) {
+    const gen = prisma.addGenerator("client", [
+      {
+        name: "provider",
+        text: '"prisma-client-js"'
+      }
+    ]);
+    const dataSource = this.zmodel.declarations.find(isDataSource);
+    if (dataSource?.fields.some((f) => f.name === "extensions")) {
+      gen.fields.push({
+        name: "previewFeatures",
+        text: '["postgresqlExtensions"]'
+      });
+    }
+  }
   generateModel(prisma, decl) {
     const model = decl.isView ? prisma.addView(decl.name) : prisma.addModel(decl.name);
     const allFields = getAllFields2(decl, true);
@@ -728,9 +746,15 @@ var PrismaSchemaGenerator = class {
     for (const field of decl.fields) {
       this.generateEnumField(_enum, field);
     }
-    for (const attr of decl.attributes.filter((attr2) => this.isPrismaAttribute(attr2))) {
+    const allAttributes = decl.attributes.filter((attr) => this.isPrismaAttribute(attr));
+    for (const attr of allAttributes) {
       this.generateContainerAttribute(_enum, attr);
     }
+    if (this.datasourceHasSchemasSetting(decl.$container) && !allAttributes.some((attr) => attr.decl.ref?.name === "@@schema")) {
+      _enum.addAttribute("@@schema", [
+        new AttributeArg(void 0, new AttributeArgValue("String", this.getDefaultPostgresSchemaName(decl.$container)))
+      ]);
+    }
     decl.comments.forEach((c) => _enum.addComment(c));
   }
   generateEnumField(_enum, field) {
@@ -856,16 +880,27 @@ var TsSchemaGenerator = class {
       ] : []
     ])), ts.factory.createStringLiteral("@zenstackhq/orm/schema"));
     statements.push(runtimeImportDecl);
-    const declaration = ts.factory.createVariableStatement([
+    const _schemaDecl = ts.factory.createVariableStatement([], ts.factory.createVariableDeclarationList([
+      ts.factory.createVariableDeclaration("_schema", void 0, void 0, ts.factory.createSatisfiesExpression(ts.factory.createAsExpression(schemaObject, ts.factory.createTypeReferenceNode("const")), ts.factory.createTypeReferenceNode("SchemaDef")))
+    ], ts.NodeFlags.Const));
+    statements.push(_schemaDecl);
+    const brandedSchemaType = ts.factory.createTypeAliasDeclaration(void 0, "Schema", void 0, ts.factory.createIntersectionTypeNode([
+      ts.factory.createTypeQueryNode(ts.factory.createIdentifier("_schema")),
+      ts.factory.createTypeLiteralNode([
+        ts.factory.createPropertySignature(void 0, "__brand", ts.factory.createToken(ts.SyntaxKind.QuestionToken), ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral("schema")))
+      ])
+    ]));
+    statements.push(brandedSchemaType);
+    const schemaExportDecl = ts.factory.createVariableStatement([
       ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)
     ], ts.factory.createVariableDeclarationList([
-      ts.factory.createVariableDeclaration("schema", void 0, void 0, ts.factory.createSatisfiesExpression(ts.factory.createAsExpression(schemaObject, ts.factory.createTypeReferenceNode("const")), ts.factory.createTypeReferenceNode("SchemaDef")))
+      ts.factory.createVariableDeclaration("schema", void 0, ts.factory.createTypeReferenceNode("Schema"), ts.factory.createIdentifier("_schema"))
     ], ts.NodeFlags.Const));
-    statements.push(declaration);
-    const typeDeclaration = ts.factory.createTypeAliasDeclaration([
+    statements.push(schemaExportDecl);
+    const schemaTypeDeclaration = ts.factory.createTypeAliasDeclaration([
       ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)
-    ], "SchemaType", void 0, ts.factory.createTypeReferenceNode("typeof schema"));
-    statements.push(typeDeclaration);
+    ], "SchemaType", void 0, ts.factory.createTypeReferenceNode("Schema"));
+    statements.push(schemaTypeDeclaration);
   }
   createExpressionUtilsCall(method, args) {
     this.usedExpressionUtils = true;
@@ -1332,7 +1367,10 @@ var TsSchemaGenerator = class {
     }
   }
   createLiteralNode(arg) {
-    return arg === null ? ts.factory.createNull() : typeof arg === "string" ? ts.factory.createStringLiteral(arg) : typeof arg === "number" ? ts.factory.createNumericLiteral(arg) : arg === true ? ts.factory.createTrue() : arg === false ? ts.factory.createFalse() : void 0;
+    return arg === null ? ts.factory.createNull() : typeof arg === "string" ? ts.factory.createStringLiteral(arg) : typeof arg === "number" ? this.createNumberLiteral(arg) : arg === true ? ts.factory.createTrue() : arg === false ? ts.factory.createFalse() : void 0;
+  }
+  createNumberLiteral(arg) {
+    return arg < 0 ? ts.factory.createPrefixUnaryExpression(ts.SyntaxKind.MinusToken, ts.factory.createNumericLiteral(-arg)) : ts.factory.createNumericLiteral(arg);
   }
   createProceduresObject(procedures) {
     return ts.factory.createObjectLiteralExpression(procedures.map((proc) => ts.factory.createPropertyAssignment(proc.name, this.createProcedureObject(proc))), true);
@@ -1466,7 +1504,7 @@ var TsSchemaGenerator = class {
   }
   generateModelsAndTypeDefs(model, options) {
     const statements = [];
-    statements.push(this.generateSchemaImport(model, true, true, !!(options.lite || options.liteOnly)));
+    statements.push(this.generateSchemaImport(model, true, true, !!(options.lite || options.liteOnly), options.importWithFileExtension));
     statements.push(ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(false, void 0, ts.factory.createNamedImports([
       ts.factory.createImportSpecifier(true, void 0, ts.factory.createIdentifier(`ModelResult as $ModelResult`)),
       ...model.declarations.some(isTypeDef3) ? [
@@ -1525,7 +1563,7 @@ var TsSchemaGenerator = class {
     const result = printer.printList(ts.ListFormat.MultiLine, ts.factory.createNodeArray(statements), sourceFile);
     fs.writeFileSync(outputFile, result);
   }
-  generateSchemaImport(model, schemaObject, schemaType, useLite) {
+  generateSchemaImport(model, schemaObject, schemaType, useLite, importWithFileExtension) {
     const importSpecifiers = [];
     if (schemaObject) {
       if (model.declarations.some(isEnum)) {
@@ -1535,7 +1573,11 @@ var TsSchemaGenerator = class {
     if (schemaType) {
       importSpecifiers.push(ts.factory.createImportSpecifier(true, ts.factory.createIdentifier("SchemaType"), ts.factory.createIdentifier("$Schema")));
     }
-    return ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(false, void 0, ts.factory.createNamedImports(importSpecifiers)), ts.factory.createStringLiteral(useLite ? "./schema-lite" : "./schema"));
+    let importFrom = useLite ? "./schema-lite" : "./schema";
+    if (importWithFileExtension) {
+      importFrom += importWithFileExtension.startsWith(".") ? importWithFileExtension : `.${importWithFileExtension}`;
+    }
+    return ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(false, void 0, ts.factory.createNamedImports(importSpecifiers)), ts.factory.createStringLiteral(importFrom));
   }
   generateDocs(tsDecl, decl) {
     return ts.addSyntheticLeadingComment(tsDecl, ts.SyntaxKind.MultiLineCommentTrivia, `*
@@ -1545,7 +1587,7 @@ var TsSchemaGenerator = class {
   generateInputTypes(model, options) {
     const dataModels = model.declarations.filter(isDataModel3);
     const statements = [];
-    statements.push(this.generateSchemaImport(model, false, true, !!(options.lite || options.liteOnly)));
+    statements.push(this.generateSchemaImport(model, false, true, !!(options.lite || options.liteOnly), options.importWithFileExtension));
     const inputTypes = [
       "FindManyArgs",
       "FindUniqueArgs",