@zenstackhq/sdk 3.4.4 → 3.4.6

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_language_ast from '@zenstackhq/language/ast';
-import { DataFieldAttribute, DataModelAttribute, Model, AstNode, DataModel, TypeDef, DataField, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, Reference, InvocationExpr } from '@zenstackhq/language/ast';
+import { DataFieldAttribute, DataModelAttribute, Model, AstNode, DataField, DataModel, TypeDef, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, Reference, InvocationExpr } from '@zenstackhq/language/ast';
 import { AttributeTarget } from '@zenstackhq/language/utils';
 import { MaybePromise } from 'langium';
 
@@ -7,6 +7,17 @@ declare function isIdField(field: DataField, contextModel: DataModel): boolean;
 declare function hasAttribute(decl: DataModel | TypeDef | DataField | Enum | EnumField | FunctionDecl | Attribute | AttributeParam, name: string): boolean;
 declare function getAttribute(decl: AttributeTarget, name: string): DataFieldAttribute | DataModelAttribute | undefined;
 declare function isDelegateModel(node: AstNode): boolean;
+/**
+ * Returns all fields that physically belong to a model's table: its directly declared
+ * fields plus fields from its mixins (recursively).
+ */
+declare function getOwnedFields(model: DataModel | TypeDef): DataField[];
+/**
+ * Returns the name of the delegate base model that "owns" the given field in the context of
+ * `contextModel`. This handles both direct fields of delegate models and mixin fields that
+ * belong to a mixin used by a delegate base model.
+ */
+declare function getDelegateOriginModel(field: DataField, contextModel: DataModel): string | undefined;
 declare function isUniqueField(field: DataField): boolean;
 declare function isFromStdlib(node: AstNode): boolean;
 declare function getContainingModel(node: AstNode | undefined): Model | null;
@@ -22,7 +33,9 @@ declare const modelUtils_DELEGATE_AUX_RELATION_PREFIX: typeof DELEGATE_AUX_RELAT
 declare const modelUtils_getAttribute: typeof getAttribute;
 declare const modelUtils_getAuthDecl: typeof getAuthDecl;
 declare const modelUtils_getContainingModel: typeof getContainingModel;
+declare const modelUtils_getDelegateOriginModel: typeof getDelegateOriginModel;
 declare const modelUtils_getIdFields: typeof getIdFields;
+declare const modelUtils_getOwnedFields: typeof getOwnedFields;
 declare const modelUtils_hasAttribute: typeof hasAttribute;
 declare const modelUtils_isDelegateModel: typeof isDelegateModel;
 declare const modelUtils_isFromStdlib: typeof isFromStdlib;
@@ -30,7 +43,7 @@ declare const modelUtils_isIdField: typeof isIdField;
 declare const modelUtils_isUniqueField: typeof isUniqueField;
 declare const modelUtils_resolved: typeof resolved;
 declare namespace modelUtils {
-  export { modelUtils_DELEGATE_AUX_RELATION_PREFIX as DELEGATE_AUX_RELATION_PREFIX, modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getIdFields as getIdFields, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
+  export { modelUtils_DELEGATE_AUX_RELATION_PREFIX as DELEGATE_AUX_RELATION_PREFIX, modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getDelegateOriginModel as getDelegateOriginModel, modelUtils_getIdFields as getIdFields, modelUtils_getOwnedFields as getOwnedFields, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
 }
 
 /**
@@ -108,7 +121,6 @@ declare class PrismaSchemaGenerator {
     private getUnsupportedFieldType;
     private generateModelField;
     private isDefaultWithAuthInvocation;
-    private isInheritedFromDelegate;
     private makeFieldAttribute;
     private makeAttributeArg;
     private makeAttributeArgValue;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_language_ast from '@zenstackhq/language/ast';
-import { DataFieldAttribute, DataModelAttribute, Model, AstNode, DataModel, TypeDef, DataField, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, Reference, InvocationExpr } from '@zenstackhq/language/ast';
+import { DataFieldAttribute, DataModelAttribute, Model, AstNode, DataField, DataModel, TypeDef, Enum, EnumField, FunctionDecl, Attribute, AttributeParam, Reference, InvocationExpr } from '@zenstackhq/language/ast';
 import { AttributeTarget } from '@zenstackhq/language/utils';
 import { MaybePromise } from 'langium';
 
@@ -7,6 +7,17 @@ declare function isIdField(field: DataField, contextModel: DataModel): boolean;
 declare function hasAttribute(decl: DataModel | TypeDef | DataField | Enum | EnumField | FunctionDecl | Attribute | AttributeParam, name: string): boolean;
 declare function getAttribute(decl: AttributeTarget, name: string): DataFieldAttribute | DataModelAttribute | undefined;
 declare function isDelegateModel(node: AstNode): boolean;
+/**
+ * Returns all fields that physically belong to a model's table: its directly declared
+ * fields plus fields from its mixins (recursively).
+ */
+declare function getOwnedFields(model: DataModel | TypeDef): DataField[];
+/**
+ * Returns the name of the delegate base model that "owns" the given field in the context of
+ * `contextModel`. This handles both direct fields of delegate models and mixin fields that
+ * belong to a mixin used by a delegate base model.
+ */
+declare function getDelegateOriginModel(field: DataField, contextModel: DataModel): string | undefined;
 declare function isUniqueField(field: DataField): boolean;
 declare function isFromStdlib(node: AstNode): boolean;
 declare function getContainingModel(node: AstNode | undefined): Model | null;
@@ -22,7 +33,9 @@ declare const modelUtils_DELEGATE_AUX_RELATION_PREFIX: typeof DELEGATE_AUX_RELAT
 declare const modelUtils_getAttribute: typeof getAttribute;
 declare const modelUtils_getAuthDecl: typeof getAuthDecl;
 declare const modelUtils_getContainingModel: typeof getContainingModel;
+declare const modelUtils_getDelegateOriginModel: typeof getDelegateOriginModel;
 declare const modelUtils_getIdFields: typeof getIdFields;
+declare const modelUtils_getOwnedFields: typeof getOwnedFields;
 declare const modelUtils_hasAttribute: typeof hasAttribute;
 declare const modelUtils_isDelegateModel: typeof isDelegateModel;
 declare const modelUtils_isFromStdlib: typeof isFromStdlib;
@@ -30,7 +43,7 @@ declare const modelUtils_isIdField: typeof isIdField;
 declare const modelUtils_isUniqueField: typeof isUniqueField;
 declare const modelUtils_resolved: typeof resolved;
 declare namespace modelUtils {
-  export { modelUtils_DELEGATE_AUX_RELATION_PREFIX as DELEGATE_AUX_RELATION_PREFIX, modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getIdFields as getIdFields, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
+  export { modelUtils_DELEGATE_AUX_RELATION_PREFIX as DELEGATE_AUX_RELATION_PREFIX, modelUtils_getAttribute as getAttribute, modelUtils_getAuthDecl as getAuthDecl, modelUtils_getContainingModel as getContainingModel, modelUtils_getDelegateOriginModel as getDelegateOriginModel, modelUtils_getIdFields as getIdFields, modelUtils_getOwnedFields as getOwnedFields, modelUtils_hasAttribute as hasAttribute, modelUtils_isDelegateModel as isDelegateModel, modelUtils_isFromStdlib as isFromStdlib, modelUtils_isIdField as isIdField, modelUtils_isUniqueField as isUniqueField, modelUtils_resolved as resolved };
 }
 
 /**
@@ -108,7 +121,6 @@ declare class PrismaSchemaGenerator {
     private getUnsupportedFieldType;
     private generateModelField;
     private isDefaultWithAuthInvocation;
-    private isInheritedFromDelegate;
     private makeFieldAttribute;
     private makeAttributeArg;
     private makeAttributeArgValue;

package/dist/index.js

@@ -12,7 +12,9 @@ __export(model_utils_exports, {
   getAttribute: () => getAttribute,
   getAuthDecl: () => getAuthDecl,
   getContainingModel: () => getContainingModel,
+  getDelegateOriginModel: () => getDelegateOriginModel,
   getIdFields: () => getIdFields,
+  getOwnedFields: () => getOwnedFields,
   hasAttribute: () => hasAttribute,
   isDelegateModel: () => isDelegateModel,
   isFromStdlib: () => isFromStdlib,
@@ -57,6 +59,29 @@ function isDelegateModel(node) {
   return isDataModel(node) && hasAttribute(node, "@@delegate");
 }
 __name(isDelegateModel, "isDelegateModel");
+function getOwnedFields(model) {
+  const fields = [
+    ...model.fields
+  ];
+  for (const mixin of model.mixins) {
+    if (mixin.ref) {
+      fields.push(...getOwnedFields(mixin.ref));
+    }
+  }
+  return fields;
+}
+__name(getOwnedFields, "getOwnedFields");
+function getDelegateOriginModel(field, contextModel) {
+  let base = contextModel.baseModel?.ref;
+  while (base) {
+    if (isDelegateModel(base) && getOwnedFields(base).some((f) => f.name === field.name)) {
+      return base.name;
+    }
+    base = base.baseModel?.ref;
+  }
+  return void 0;
+}
+__name(getDelegateOriginModel, "getDelegateOriginModel");
 function isUniqueField(field) {
   if (hasAttribute(field, "@unique")) {
     return true;
@@ -610,7 +635,7 @@ var PrismaSchemaGenerator = class {
       if (model_utils_exports.hasAttribute(field, "@computed")) {
         continue;
       }
-      if (model_utils_exports.isIdField(field, decl) || !this.isInheritedFromDelegate(field, decl)) {
+      if (model_utils_exports.isIdField(field, decl) || !getDelegateOriginModel(field, decl)) {
         this.generateModelField(model, field, decl);
       }
     }
@@ -682,7 +707,7 @@ var PrismaSchemaGenerator = class {
     const type = new ModelFieldType(fieldType, isArray, field.type.optional);
     const attributes = field.attributes.filter((attr) => this.isPrismaAttribute(attr)).filter((attr) => !this.isDefaultWithAuthInvocation(attr)).filter((attr) => (
       // when building physical schema, exclude `@default` for id fields inherited from delegate base
-      !(model_utils_exports.isIdField(field, contextModel) && this.isInheritedFromDelegate(field, contextModel) && attr.decl.$refText === "@default")
+      !(model_utils_exports.isIdField(field, contextModel) && getDelegateOriginModel(field, contextModel) && attr.decl.$refText === "@default")
     )).map((attr) => this.makeFieldAttribute(attr));
     const docs = [
       ...field.comments
@@ -700,9 +725,6 @@ var PrismaSchemaGenerator = class {
     }
     return AstUtils.streamAst(expr).some(isAuthInvocation);
   }
-  isInheritedFromDelegate(field, contextModel) {
-    return field.$container !== contextModel && model_utils_exports.isDelegateModel(field.$container);
-  }
   makeFieldAttribute(attr) {
     const attrName = attr.decl.ref.name;
     return new FieldAttribute(attrName, attr.args.map((arg) => this.makeAttributeArg(arg)));
@@ -1067,8 +1089,11 @@ var TsSchemaGenerator = class {
       objectFields.push(ts.factory.createPropertyAssignment("omit", ts.factory.createTrue()));
     }
     if (contextModel && // id fields are duplicated in inherited models
-    !isIdField(field, contextModel) && field.$container !== contextModel && isDelegateModel(field.$container)) {
-      objectFields.push(ts.factory.createPropertyAssignment("originModel", ts.factory.createStringLiteral(field.$container.name)));
+    !isIdField(field, contextModel)) {
+      const delegateOrigin = getDelegateOriginModel(field, contextModel);
+      if (delegateOrigin) {
+        objectFields.push(ts.factory.createPropertyAssignment("originModel", ts.factory.createStringLiteral(delegateOrigin)));
+      }
     }
     if (this.isDiscriminatorField(field)) {
       objectFields.push(ts.factory.createPropertyAssignment("isDiscriminator", ts.factory.createTrue()));