@zenstackhq/sdk 3.4.6 → 3.5.0-beta.1

package/dist/index.d.cts

@@ -145,12 +145,16 @@ type TsSchemaGeneratorOptions = {
 };
 declare class TsSchemaGenerator {
     private usedExpressionUtils;
+    private usedAttributeApplication;
+    private usedFieldDefault;
     generate(model: Model, options: TsSchemaGeneratorOptions): Promise<void>;
     private generateSchema;
     private generateSchemaStatements;
     private createExpressionUtilsCall;
     private createSchemaClass;
     private createAsConst;
+    private createAttributesTypeAssertion;
+    private createDefaultTypeAssertion;
     private createProviderObject;
     private createModelsObject;
     private getAllDataModels;

package/dist/index.d.ts

@@ -145,12 +145,16 @@ type TsSchemaGeneratorOptions = {
 };
 declare class TsSchemaGenerator {
     private usedExpressionUtils;
+    private usedAttributeApplication;
+    private usedFieldDefault;
     generate(model: Model, options: TsSchemaGeneratorOptions): Promise<void>;
     private generateSchema;
     private generateSchemaStatements;
     private createExpressionUtilsCall;
     private createSchemaClass;
     private createAsConst;
+    private createAttributesTypeAssertion;
+    private createDefaultTypeAssertion;
     private createProviderObject;
     private createModelsObject;
     private getAllDataModels;

package/dist/index.js

@@ -855,11 +855,12 @@ var TsSchemaGenerator = class {
     __name(this, "TsSchemaGenerator");
   }
   usedExpressionUtils = false;
+  usedAttributeApplication = false;
+  usedFieldDefault = false;
   async generate(model, options) {
     fs.mkdirSync(options.outDir, {
       recursive: true
     });
-    this.usedExpressionUtils = false;
     this.generateSchema(model, options);
     if (options.generateModelTypes !== false) {
       this.generateModelsAndTypeDefs(model, options);
@@ -883,6 +884,9 @@ var TsSchemaGenerator = class {
       });
     }
     for (const { lite, file } of targets) {
+      this.usedExpressionUtils = false;
+      this.usedAttributeApplication = false;
+      this.usedFieldDefault = false;
       const statements = [];
       this.generateSchemaStatements(model, statements, lite);
       this.generateBannerComments(statements);
@@ -897,6 +901,12 @@ var TsSchemaGenerator = class {
     const schemaClass = this.createSchemaClass(model, lite);
     const schemaImportDecl = ts.factory.createImportDeclaration(void 0, ts.factory.createImportClause(void 0, void 0, ts.factory.createNamedImports([
       ts.factory.createImportSpecifier(true, void 0, ts.factory.createIdentifier("SchemaDef")),
+      ...this.usedAttributeApplication ? [
+        ts.factory.createImportSpecifier(true, void 0, ts.factory.createIdentifier("AttributeApplication"))
+      ] : [],
+      ...this.usedFieldDefault ? [
+        ts.factory.createImportSpecifier(true, void 0, ts.factory.createIdentifier("FieldDefault"))
+      ] : [],
       ...this.usedExpressionUtils ? [
         ts.factory.createImportSpecifier(false, void 0, ts.factory.createIdentifier("ExpressionUtils"))
       ] : []
@@ -950,6 +960,14 @@ var TsSchemaGenerator = class {
   createAsConst(expr) {
     return ts.factory.createAsExpression(expr, ts.factory.createTypeReferenceNode("const"));
   }
+  createAttributesTypeAssertion(expr) {
+    this.usedAttributeApplication = true;
+    return ts.factory.createAsExpression(expr, ts.factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, ts.factory.createArrayTypeNode(ts.factory.createTypeReferenceNode("AttributeApplication"))));
+  }
+  createDefaultTypeAssertion(expr) {
+    this.usedFieldDefault = true;
+    return ts.factory.createAsExpression(expr, ts.factory.createTypeReferenceNode("FieldDefault"));
+  }
   createProviderObject(model) {
     const dsProvider = this.getDataSourceProvider(model);
     const defaultSchema = this.getDataSourceDefaultSchema(model);
@@ -992,7 +1010,7 @@ var TsSchemaGenerator = class {
       ts.factory.createPropertyAssignment("fields", ts.factory.createObjectLiteralExpression(allFields.map((field) => ts.factory.createPropertyAssignment(field.name, this.createDataFieldObject(field, dm, lite))), true)),
       // attributes
       ...allAttributes.length > 0 ? [
-        ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(allAttributes.map((attr) => this.createAttributeObject(attr)), true))
+        ts.factory.createPropertyAssignment("attributes", this.createAttributesTypeAssertion(ts.factory.createArrayLiteralExpression(allAttributes.map((attr) => this.createAttributeObject(attr)), true)))
       ] : [],
       // idFields
       ts.factory.createPropertyAssignment("idFields", ts.factory.createArrayLiteralExpression(getIdFields(dm).map((idField) => ts.factory.createStringLiteral(idField)))),
@@ -1029,7 +1047,7 @@ var TsSchemaGenerator = class {
       ts.factory.createPropertyAssignment("fields", ts.factory.createObjectLiteralExpression(allFields.map((field) => ts.factory.createPropertyAssignment(field.name, this.createDataFieldObject(field, void 0, lite))), true)),
       // attributes
       ...allAttributes.length > 0 ? [
-        ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(allAttributes.map((attr) => this.createAttributeObject(attr)), true))
+        ts.factory.createPropertyAssignment("attributes", this.createAttributesTypeAssertion(ts.factory.createArrayLiteralExpression(allAttributes.map((attr) => this.createAttributeObject(attr)), true)))
       ] : []
     ];
     return ts.factory.createObjectLiteralExpression(fields, true);
@@ -1099,39 +1117,39 @@ var TsSchemaGenerator = class {
       objectFields.push(ts.factory.createPropertyAssignment("isDiscriminator", ts.factory.createTrue()));
     }
     if (!lite && field.attributes.length > 0) {
-      objectFields.push(ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(field.attributes.map((attr) => this.createAttributeObject(attr)))));
+      objectFields.push(ts.factory.createPropertyAssignment("attributes", this.createAttributesTypeAssertion(ts.factory.createArrayLiteralExpression(field.attributes.map((attr) => this.createAttributeObject(attr))))));
     }
     const defaultValue = this.getFieldMappedDefault(field);
     if (defaultValue !== void 0) {
+      let defaultExpr;
       if (defaultValue === null) {
-        objectFields.push(ts.factory.createPropertyAssignment("default", this.createExpressionUtilsCall("_null")));
+        defaultExpr = this.createExpressionUtilsCall("_null");
       } else if (typeof defaultValue === "object" && !Array.isArray(defaultValue)) {
         if ("call" in defaultValue) {
-          objectFields.push(ts.factory.createPropertyAssignment("default", this.createExpressionUtilsCall("call", [
+          defaultExpr = this.createExpressionUtilsCall("call", [
             ts.factory.createStringLiteral(defaultValue.call),
             ...defaultValue.args.length > 0 ? [
               ts.factory.createArrayLiteralExpression(defaultValue.args.map((arg) => this.createExpressionUtilsCall("literal", [
                 this.createLiteralNode(arg)
               ])))
             ] : []
-          ])));
+          ]);
         } else if ("authMember" in defaultValue) {
-          objectFields.push(ts.factory.createPropertyAssignment("default", this.createExpressionUtilsCall("member", [
+          defaultExpr = this.createExpressionUtilsCall("member", [
             this.createExpressionUtilsCall("call", [
               ts.factory.createStringLiteral("auth")
             ]),
             ts.factory.createArrayLiteralExpression(defaultValue.authMember.map((m) => ts.factory.createStringLiteral(m)))
-          ])));
+          ]);
         } else {
           throw new Error(`Unsupported default value type for field ${field.name}`);
         }
+      } else if (Array.isArray(defaultValue)) {
+        defaultExpr = ts.factory.createArrayLiteralExpression(defaultValue.map((item) => this.createLiteralNode(item)));
       } else {
-        if (Array.isArray(defaultValue)) {
-          objectFields.push(ts.factory.createPropertyAssignment("default", ts.factory.createArrayLiteralExpression(defaultValue.map((item) => this.createLiteralNode(item)))));
-        } else {
-          objectFields.push(ts.factory.createPropertyAssignment("default", this.createLiteralNode(defaultValue)));
-        }
+        defaultExpr = this.createLiteralNode(defaultValue);
       }
+      objectFields.push(ts.factory.createPropertyAssignment("default", this.createDefaultTypeAssertion(defaultExpr)));
     }
     if (hasAttribute(field, "@computed")) {
       objectFields.push(ts.factory.createPropertyAssignment("computed", ts.factory.createTrue()));
@@ -1141,7 +1159,7 @@ var TsSchemaGenerator = class {
     }
     const fkFor = this.getForeignKeyFor(field);
     if (fkFor && fkFor.length > 0) {
-      objectFields.push(ts.factory.createPropertyAssignment("foreignKeyFor", ts.factory.createArrayLiteralExpression(fkFor.map((fk) => ts.factory.createStringLiteral(fk)), true)));
+      objectFields.push(ts.factory.createPropertyAssignment("foreignKeyFor", ts.factory.createAsExpression(ts.factory.createArrayLiteralExpression(fkFor.map((fk) => ts.factory.createStringLiteral(fk)), true), ts.factory.createTypeOperatorNode(ts.SyntaxKind.ReadonlyKeyword, ts.factory.createArrayTypeNode(ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword))))));
     }
     return ts.factory.createObjectLiteralExpression(objectFields, true);
   }
@@ -1383,12 +1401,12 @@ var TsSchemaGenerator = class {
         ts.factory.createPropertyAssignment("fields", ts.factory.createObjectLiteralExpression(e.fields.map((field) => ts.factory.createPropertyAssignment(field.name, ts.factory.createObjectLiteralExpression([
           ts.factory.createPropertyAssignment("name", ts.factory.createStringLiteral(field.name)),
           ...field.attributes.length > 0 ? [
-            ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(field.attributes?.map((attr) => this.createAttributeObject(attr)) ?? [], true))
+            ts.factory.createPropertyAssignment("attributes", this.createAttributesTypeAssertion(ts.factory.createArrayLiteralExpression(field.attributes?.map((attr) => this.createAttributeObject(attr)) ?? [], true)))
           ] : []
         ], true))), true))
       ] : [],
       ...e.attributes.length > 0 ? [
-        ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(e.attributes.map((attr) => this.createAttributeObject(attr)), true))
+        ts.factory.createPropertyAssignment("attributes", this.createAttributesTypeAssertion(ts.factory.createArrayLiteralExpression(e.attributes.map((attr) => this.createAttributeObject(attr)), true)))
       ] : []
     ], true);
   }