@zenstackhq/sdk 3.0.0-alpha.4 → 3.0.0-alpha.7

package/dist/index.d.cts

@@ -1,5 +1,6 @@
 import * as _zenstackhq_language_ast from '@zenstackhq/language/ast';
 import { DataModelField, DataModel, TypeDef, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, TypeDefField, DataModelFieldAttribute, DataModelAttribute, AstNode, Model, Reference, InvocationExpr } from '@zenstackhq/language/ast';
+import { MaybePromise } from 'langium';
 
 declare function isIdField(field: DataModelField): boolean;
 declare function hasAttribute(decl: DataModel | TypeDef | DataModelField | Enum | EnumField | FunctionDecl | Attribute | AttributeParam, name: string): boolean;
@@ -36,6 +37,13 @@ declare namespace modelUtils {
   export { modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getModelIdFields as getModelIdFields, modelUtils_getModelUniqueFields as getModelUniqueFields, modelUtils_getRecursiveBases as getRecursiveBases, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
 }
 
+type CliGeneratorContext = {
+    model: Model;
+    outputPath: string;
+    tsSchemaFile: string;
+};
+type CliGenerator = (context: CliGeneratorContext) => MaybePromise<void>;
+
 declare class FunctionCall {
     func: string;
     args: FunctionCallArg[];
@@ -92,10 +100,11 @@ declare class TsSchemaGenerator {
     private createModelsObject;
     private createDataModelObject;
     private createComputedFieldsObject;
-    private mapTypeToTSSyntaxKeyword;
+    private mapFieldTypeToTSType;
     private createDataModelFieldObject;
     private getDataSourceProvider;
-    private getMappedDefault;
+    private getFieldMappedDefault;
+    private getMappedValue;
     private getMemberAccessChain;
     private isAuthMemberAccess;
     private isAuthInvocation;
@@ -106,6 +115,7 @@ declare class TsSchemaGenerator {
     private getRelationName;
     private getIdFields;
     private createUniqueFieldsObject;
+    private generateFieldTypeLiteral;
     private createEnumObject;
     private getLiteral;
     private createLiteralNode;
@@ -192,4 +202,4 @@ declare class ZModelCodeGenerator {
     private isCollectionPredicateOperator;
 }
 
-export { modelUtils as ModelUtils, PrismaSchemaGenerator, TsSchemaGenerator, ZModelCodeGenerator, type ZModelCodeOptions };
+export { type CliGenerator, type CliGeneratorContext, modelUtils as ModelUtils, PrismaSchemaGenerator, TsSchemaGenerator, ZModelCodeGenerator, type ZModelCodeOptions };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as _zenstackhq_language_ast from '@zenstackhq/language/ast';
 import { DataModelField, DataModel, TypeDef, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, TypeDefField, DataModelFieldAttribute, DataModelAttribute, AstNode, Model, Reference, InvocationExpr } from '@zenstackhq/language/ast';
+import { MaybePromise } from 'langium';
 
 declare function isIdField(field: DataModelField): boolean;
 declare function hasAttribute(decl: DataModel | TypeDef | DataModelField | Enum | EnumField | FunctionDecl | Attribute | AttributeParam, name: string): boolean;
@@ -36,6 +37,13 @@ declare namespace modelUtils {
   export { modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getModelIdFields as getModelIdFields, modelUtils_getModelUniqueFields as getModelUniqueFields, modelUtils_getRecursiveBases as getRecursiveBases, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
 }
 
+type CliGeneratorContext = {
+    model: Model;
+    outputPath: string;
+    tsSchemaFile: string;
+};
+type CliGenerator = (context: CliGeneratorContext) => MaybePromise<void>;
+
 declare class FunctionCall {
     func: string;
     args: FunctionCallArg[];
@@ -92,10 +100,11 @@ declare class TsSchemaGenerator {
     private createModelsObject;
     private createDataModelObject;
     private createComputedFieldsObject;
-    private mapTypeToTSSyntaxKeyword;
+    private mapFieldTypeToTSType;
     private createDataModelFieldObject;
     private getDataSourceProvider;
-    private getMappedDefault;
+    private getFieldMappedDefault;
+    private getMappedValue;
     private getMemberAccessChain;
     private isAuthMemberAccess;
     private isAuthInvocation;
@@ -106,6 +115,7 @@ declare class TsSchemaGenerator {
     private getRelationName;
     private getIdFields;
     private createUniqueFieldsObject;
+    private generateFieldTypeLiteral;
     private createEnumObject;
     private getLiteral;
     private createLiteralNode;
@@ -192,4 +202,4 @@ declare class ZModelCodeGenerator {
     private isCollectionPredicateOperator;
 }
 
-export { modelUtils as ModelUtils, PrismaSchemaGenerator, TsSchemaGenerator, ZModelCodeGenerator, type ZModelCodeOptions };
+export { type CliGenerator, type CliGeneratorContext, modelUtils as ModelUtils, PrismaSchemaGenerator, TsSchemaGenerator, ZModelCodeGenerator, type ZModelCodeOptions };

package/dist/index.js

@@ -285,9 +285,9 @@ var Model = class extends ContainerDeclaration {
   }
   name;
   isView;
-  fields;
+  fields = [];
   constructor(name, isView, documentations = []) {
-    super(documentations), this.name = name, this.isView = isView, this.fields = [];
+    super(documentations), this.name = name, this.isView = isView;
   }
   addField(name, type, attributes = [], documentations = [], addToFront = false) {
     const field = new ModelField(name, type, attributes, documentations);
@@ -507,9 +507,9 @@ var Enum = class extends ContainerDeclaration {
     __name(this, "Enum");
   }
   name;
-  fields;
+  fields = [];
   constructor(name, documentations = []) {
-    super(documentations), this.name = name, this.fields = [];
+    super(documentations), this.name = name;
   }
   addField(name, attributes = [], documentations = []) {
     const field = new EnumField(name, attributes, documentations);
@@ -558,15 +558,14 @@ var PrismaSchemaGenerator = class {
     __name(this, "PrismaSchemaGenerator");
   }
   zmodel;
-  PRELUDE;
-  constructor(zmodel) {
-    this.zmodel = zmodel;
-    this.PRELUDE = `//////////////////////////////////////////////////////////////////////////////////////////////
+  PRELUDE = `//////////////////////////////////////////////////////////////////////////////////////////////
 // DO NOT MODIFY THIS FILE                                                                  //
 // This file is automatically generated by ZenStack CLI and should not be manually updated. //
 //////////////////////////////////////////////////////////////////////////////////////////////
 
 `;
+  constructor(zmodel) {
+    this.zmodel = zmodel;
   }
   async generate() {
     const prisma = new PrismaModel();
@@ -777,11 +776,11 @@ var PrismaSchemaGenerator = class {
 };
 
 // src/ts-schema-generator.ts
+import { invariant } from "@zenstackhq/common-helpers";
 import { loadDocument } from "@zenstackhq/language";
 import { isArrayExpr as isArrayExpr3, isBinaryExpr, isDataModel as isDataModel2, isDataModelField, isDataSource, isEnum, isEnumField, isInvocationExpr as isInvocationExpr2, isLiteralExpr as isLiteralExpr3, isMemberAccessExpr, isNullExpr as isNullExpr2, isProcedure, isReferenceExpr as isReferenceExpr3, isThisExpr, isUnaryExpr } from "@zenstackhq/language/ast";
-import fs from "node:fs";
-import path from "node:path";
-import invariant from "tiny-invariant";
+import fs from "fs";
+import path from "path";
 import { match as match2 } from "ts-pattern";
 import * as ts from "typescript";
 var TsSchemaGenerator = class {
@@ -882,19 +881,26 @@ var TsSchemaGenerator = class {
   }
   createComputedFieldsObject(fields) {
     return ts.factory.createObjectLiteralExpression(fields.map((field) => ts.factory.createMethodDeclaration(void 0, void 0, field.name, void 0, void 0, [], ts.factory.createTypeReferenceNode("OperandExpression", [
-      ts.factory.createKeywordTypeNode(this.mapTypeToTSSyntaxKeyword(field.type.type))
+      ts.factory.createTypeReferenceNode(this.mapFieldTypeToTSType(field.type))
     ]), ts.factory.createBlock([
       ts.factory.createThrowStatement(ts.factory.createNewExpression(ts.factory.createIdentifier("Error"), void 0, [
         ts.factory.createStringLiteral("This is a stub for computed field")
       ]))
     ], true))), true);
   }
-  mapTypeToTSSyntaxKeyword(type) {
-    return match2(type).with("String", () => ts.SyntaxKind.StringKeyword).with("Boolean", () => ts.SyntaxKind.BooleanKeyword).with("Int", () => ts.SyntaxKind.NumberKeyword).with("Float", () => ts.SyntaxKind.NumberKeyword).with("BigInt", () => ts.SyntaxKind.BigIntKeyword).with("Decimal", () => ts.SyntaxKind.NumberKeyword).otherwise(() => ts.SyntaxKind.UnknownKeyword);
+  mapFieldTypeToTSType(type) {
+    let result = match2(type.type).with("String", () => "string").with("Boolean", () => "boolean").with("Int", () => "number").with("Float", () => "number").with("BigInt", () => "bigint").with("Decimal", () => "number").otherwise(() => "unknown");
+    if (type.array) {
+      result = `${result}[]`;
+    }
+    if (type.optional) {
+      result = `${result} | null`;
+    }
+    return result;
   }
   createDataModelFieldObject(field) {
     const objectFields = [
-      ts.factory.createPropertyAssignment("type", ts.factory.createStringLiteral(field.type.type ?? field.type.reference.$refText))
+      ts.factory.createPropertyAssignment("type", this.generateFieldTypeLiteral(field))
     ];
     if (isIdField(field)) {
       objectFields.push(ts.factory.createPropertyAssignment("id", ts.factory.createTrue()));
@@ -914,9 +920,9 @@ var TsSchemaGenerator = class {
     if (field.attributes.length > 0) {
       objectFields.push(ts.factory.createPropertyAssignment("attributes", ts.factory.createArrayLiteralExpression(field.attributes.map((attr) => this.createAttributeObject(attr)))));
     }
-    const defaultValue = this.getMappedDefault(field);
+    const defaultValue = this.getFieldMappedDefault(field);
     if (defaultValue !== void 0) {
-      if (typeof defaultValue === "object") {
+      if (typeof defaultValue === "object" && !Array.isArray(defaultValue)) {
         if ("call" in defaultValue) {
           objectFields.push(ts.factory.createPropertyAssignment("default", ts.factory.createCallExpression(ts.factory.createIdentifier("ExpressionUtils.call"), void 0, [
             ts.factory.createStringLiteral(defaultValue.call),
@@ -935,7 +941,11 @@ var TsSchemaGenerator = class {
           throw new Error(`Unsupported default value type for field ${field.name}`);
         }
       } else {
-        objectFields.push(ts.factory.createPropertyAssignment("default", typeof defaultValue === "string" ? ts.factory.createStringLiteral(defaultValue) : typeof defaultValue === "number" ? ts.factory.createNumericLiteral(defaultValue) : defaultValue === true ? ts.factory.createTrue() : ts.factory.createFalse()));
+        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)));
+        }
       }
     }
     if (hasAttribute(field, "@computed")) {
@@ -976,34 +986,39 @@ var TsSchemaGenerator = class {
       throw new Error("Unsupported URL type");
     }
   }
-  getMappedDefault(field) {
+  getFieldMappedDefault(field) {
     const defaultAttr = getAttribute(field, "@default");
     if (!defaultAttr) {
       return void 0;
     }
     const defaultValue = defaultAttr.args[0]?.value;
     invariant(defaultValue, "Expected a default value");
-    if (isLiteralExpr3(defaultValue)) {
-      const lit = defaultValue.value;
-      return field.type.type === "Boolean" ? lit : [
+    return this.getMappedValue(defaultValue, field.type);
+  }
+  getMappedValue(expr, fieldType) {
+    if (isLiteralExpr3(expr)) {
+      const lit = expr.value;
+      return fieldType.type === "Boolean" ? lit : [
         "Int",
         "Float",
         "Decimal",
         "BigInt"
-      ].includes(field.type.type) ? Number(lit) : lit;
-    } else if (isReferenceExpr3(defaultValue) && isEnumField(defaultValue.target.ref)) {
-      return defaultValue.target.ref.name;
-    } else if (isInvocationExpr2(defaultValue)) {
+      ].includes(fieldType.type) ? Number(lit) : lit;
+    } else if (isArrayExpr3(expr)) {
+      return expr.items.map((item) => this.getMappedValue(item, fieldType));
+    } else if (isReferenceExpr3(expr) && isEnumField(expr.target.ref)) {
+      return expr.target.ref.name;
+    } else if (isInvocationExpr2(expr)) {
       return {
-        call: defaultValue.function.$refText,
-        args: defaultValue.args.map((arg) => this.getLiteral(arg.value))
+        call: expr.function.$refText,
+        args: expr.args.map((arg) => this.getLiteral(arg.value))
       };
-    } else if (this.isAuthMemberAccess(defaultValue)) {
+    } else if (this.isAuthMemberAccess(expr)) {
       return {
-        authMember: this.getMemberAccessChain(defaultValue)
+        authMember: this.getMemberAccessChain(expr)
       };
     } else {
-      throw new Error(`Unsupported default value type for field ${field.name}`);
+      throw new Error(`Unsupported default value type for ${expr.$type}`);
     }
   }
   getMemberAccessChain(expr) {
@@ -1116,10 +1131,11 @@ var TsSchemaGenerator = class {
     for (const field of dm.fields) {
       if (hasAttribute(field, "@id") || hasAttribute(field, "@unique")) {
         properties.push(ts.factory.createPropertyAssignment(field.name, ts.factory.createObjectLiteralExpression([
-          ts.factory.createPropertyAssignment("type", ts.factory.createStringLiteral(field.type.type))
+          ts.factory.createPropertyAssignment("type", this.generateFieldTypeLiteral(field))
         ])));
       }
     }
+    const seenKeys = /* @__PURE__ */ new Set();
     for (const attr of dm.attributes) {
       if (attr.decl.$refText === "@@id" || attr.decl.$refText === "@@unique") {
         const fieldNames = this.getReferenceNames(attr.args[0].value);
@@ -1129,13 +1145,18 @@ var TsSchemaGenerator = class {
         if (fieldNames.length === 1) {
           const fieldDef = dm.fields.find((f) => f.name === fieldNames[0]);
           properties.push(ts.factory.createPropertyAssignment(fieldNames[0], ts.factory.createObjectLiteralExpression([
-            ts.factory.createPropertyAssignment("type", ts.factory.createStringLiteral(fieldDef.type.type))
+            ts.factory.createPropertyAssignment("type", this.generateFieldTypeLiteral(fieldDef))
           ])));
         } else {
+          const key = fieldNames.join("_");
+          if (seenKeys.has(key)) {
+            continue;
+          }
+          seenKeys.add(key);
           properties.push(ts.factory.createPropertyAssignment(fieldNames.join("_"), ts.factory.createObjectLiteralExpression(fieldNames.map((field) => {
             const fieldDef = dm.fields.find((f) => f.name === field);
             return ts.factory.createPropertyAssignment(field, ts.factory.createObjectLiteralExpression([
-              ts.factory.createPropertyAssignment("type", ts.factory.createStringLiteral(fieldDef.type.type))
+              ts.factory.createPropertyAssignment("type", this.generateFieldTypeLiteral(fieldDef))
             ]));
           }))));
         }
@@ -1143,6 +1164,10 @@ var TsSchemaGenerator = class {
     }
     return ts.factory.createObjectLiteralExpression(properties, true);
   }
+  generateFieldTypeLiteral(field) {
+    invariant(field.type.type || field.type.reference || field.type.unsupported, "Field type must be a primitive, reference, or Unsupported");
+    return field.type.type ? ts.factory.createStringLiteral(field.type.type) : field.type.reference ? ts.factory.createStringLiteral(field.type.reference.$refText) : ts.factory.createStringLiteral("unknown");
+  }
   createEnumObject(e) {
     return ts.factory.createObjectLiteralExpression(e.fields.map((field) => ts.factory.createPropertyAssignment(field.name, ts.factory.createStringLiteral(field.name))), true);
   }
@@ -1197,6 +1222,8 @@ var TsSchemaGenerator = class {
 // This file is automatically generated by ZenStack CLI and should not be manually updated. //
 //////////////////////////////////////////////////////////////////////////////////////////////
 
+/* eslint-disable */
+
 `;
     ts.addSyntheticLeadingComment(statements[0], ts.SyntaxKind.SingleLineCommentTrivia, banner);
   }