@zenstackhq/language 3.4.0-beta.1 → 3.4.0-beta.3

package/dist/index.js

@@ -7737,11 +7737,7 @@ var ZModelCodeGenerator = class {
     return `${this.quote}${trimmedVal}${this.quote}`;
   }
   _generateModel(ast) {
-    return `${ast.imports.map((d) => this.generate(d)).join("\n")}${ast.imports.length > 0 ? "\n\n" : ""}${ast.declarations.sort((a, b) => {
-      if (a.$type === "Enum" && b.$type !== "Enum") return 1;
-      if (a.$type !== "Enum" && b.$type === "Enum") return -1;
-      return 0;
-    }).map((d) => this.generate(d)).join("\n\n")}`;
+    return `${ast.imports.map((d) => this.generate(d)).join("\n")}${ast.imports.length > 0 ? "\n\n" : ""}${ast.declarations.map((d) => this.generate(d)).join("\n\n")}`;
   }
   _generateDataSource(ast) {
     return `datasource ${ast.name} {
@@ -7752,12 +7748,20 @@ ${ast.fields.map((x) => this.indent + this.generate(x)).join("\n")}
     return `import ${this.quotedStr(ast.path)}`;
   }
   _generateEnum(ast) {
-    return `enum ${ast.name} {
+    const comments = `${ast.comments.join("\n")}
+`;
+    return `${ast.comments.length > 0 ? comments : ""}enum ${ast.name} {
 ${ast.fields.map((x) => this.indent + this.generate(x)).join("\n")}${ast.attributes.length > 0 ? "\n\n" + ast.attributes.map((x) => this.indent + this.generate(x)).join("\n") : ""}
 }`;
   }
   _generateEnumField(ast) {
-    return `${ast.name}${ast.attributes.length > 0 ? " " + ast.attributes.map((x) => this.generate(x)).join(" ") : ""}`;
+    const fieldLine = `${ast.name}${ast.attributes.length > 0 ? " " + ast.attributes.map((x) => this.generate(x)).join(" ") : ""}`;
+    if (ast.comments.length === 0) {
+      return fieldLine;
+    }
+    const commentLines = ast.comments.map((c, i) => i === 0 ? c : this.indent + c);
+    return `${commentLines.join("\n")}
+${this.indent}${fieldLine}`;
   }
   _generateGenerator(ast) {
     return `generator ${ast.name} {