add viewer to generated pattern types (#1800)

lolopinto · Mar 24, 2024 · eb52e52 · eb52e52
1 parent 1801608
commit eb52e52
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 34 deletions.
diff --git a/examples/ent-rsvp/backend/src/ent/generated/event_activity_base.ts b/examples/ent-rsvp/backend/src/ent/generated/event_activity_base.ts
diff --git a/examples/ent-rsvp/backend/src/ent/generated/guest_base.ts b/examples/ent-rsvp/backend/src/ent/generated/guest_base.ts
diff --git a/examples/simple/src/ent/generated/contact_base.ts b/examples/simple/src/ent/generated/contact_base.ts
diff --git a/examples/simple/src/ent/generated/contact_email_base.ts b/examples/simple/src/ent/generated/contact_email_base.ts
diff --git a/examples/simple/src/ent/generated/contact_phone_number_base.ts b/examples/simple/src/ent/generated/contact_phone_number_base.ts
diff --git a/examples/simple/src/ent/generated/holiday_base.ts b/examples/simple/src/ent/generated/holiday_base.ts
diff --git a/examples/simple/src/ent/generated/hours_of_operation_base.ts b/examples/simple/src/ent/generated/hours_of_operation_base.ts
diff --git a/examples/simple/src/ent/generated/mixins/contact_info_base.ts b/examples/simple/src/ent/generated/mixins/contact_info_base.ts
diff --git a/examples/simple/src/ent/generated/mixins/day_of_week_base.ts b/examples/simple/src/ent/generated/mixins/day_of_week_base.ts
diff --git a/examples/simple/src/ent/generated/mixins/feedback_base.ts b/examples/simple/src/ent/generated/mixins/feedback_base.ts
diff --git a/examples/simple/src/ent/generated/user_base.ts b/examples/simple/src/ent/generated/user_base.ts
diff --git a/examples/simple/src/ent/mixins/contact_info.ts b/examples/simple/src/ent/mixins/contact_info.ts
@@ -3,14 +3,15 @@
  * Generated by github.com/lolopinto/ent/ent, DO NOT EDIT.
  */
 
-import { Viewer } from "@snowtop/ent";
 import {
   ContactInfoBaseMixin,
   IContactInfoBase,
 } from "../generated/mixins/contact_info_base";
+import { ExampleViewer as ExampleViewerAlias } from "../../viewer/viewer";
 
-export interface IContactInfo<TViewer extends Viewer = Viewer>
-  extends IContactInfoBase<TViewer> {
+export interface IContactInfo<
+  TViewer extends ExampleViewerAlias = ExampleViewerAlias,
+> extends IContactInfoBase<TViewer> {
   isContactInfo(): boolean;
 
   // add custom fields

diff --git a/examples/simple/src/ent/mixins/day_of_week.ts b/examples/simple/src/ent/mixins/day_of_week.ts
@@ -3,14 +3,15 @@
  * Generated by github.com/lolopinto/ent/ent, DO NOT EDIT.
  */
 
-import { Viewer } from "@snowtop/ent";
 import {
   DayOfWeekBaseMixin,
   IDayOfWeekBase,
 } from "../generated/mixins/day_of_week_base";
+import { ExampleViewer as ExampleViewerAlias } from "../../viewer/viewer";
 
-export interface IDayOfWeek<TViewer extends Viewer = Viewer>
-  extends IDayOfWeekBase<TViewer> {
+export interface IDayOfWeek<
+  TViewer extends ExampleViewerAlias = ExampleViewerAlias,
+> extends IDayOfWeekBase<TViewer> {
   isDayOfWeek(): boolean;
 
   // add custom fields

diff --git a/examples/simple/src/ent/mixins/feedback.ts b/examples/simple/src/ent/mixins/feedback.ts
@@ -2,18 +2,17 @@
  * Copyright whaa whaa
  * Generated by github.com/lolopinto/ent/ent, DO NOT EDIT.
  */
-import { Viewer } from "@snowtop/ent";
+
 import {
   FeedbackBaseMixin,
   IFeedbackBase,
 } from "../generated/mixins/feedback_base";
+import { ExampleViewer as ExampleViewerAlias } from "../../viewer/viewer";
 
-export interface IFeedback<TViewer extends Viewer = Viewer>
-  extends IFeedbackBase<TViewer> {
-  // add custom fields
+export interface IFeedback<
+  TViewer extends ExampleViewerAlias = ExampleViewerAlias,
+> extends IFeedbackBase<TViewer> {
   isFeedback(): boolean;
-
-  hasLikers(): Promise<boolean>;
 }
 
 type Constructor<T extends IFeedback = IFeedback> = new (...args: any[]) => T;

diff --git a/examples/todo-sqlite/src/ent/generated/account_base.ts b/examples/todo-sqlite/src/ent/generated/account_base.ts
diff --git a/examples/todo-sqlite/src/ent/generated/workspace_base.ts b/examples/todo-sqlite/src/ent/generated/workspace_base.ts
diff --git a/internal/schema/node_data.go b/internal/schema/node_data.go
@@ -831,13 +831,16 @@ type mixinInfo struct {
 	Implements string
 }
 
-func (nodeData *NodeData) GetMixinInfo(s *Schema) (*mixinInfo, error) {
+func (nodeData *NodeData) GetMixinInfo(s *Schema, cfg codegenapi.Config) (*mixinInfo, error) {
 	var imps []*tsimport.ImportPath
 
 	var extends strings.Builder
 	var impls []string
 
 	var interfaces []string
+
+	viewerType := cfg.GetTemplatizedViewer().GetImport()
+
 	for _, p := range nodeData.PatternsWithMixins {
 		pattern := s.Patterns[p]
 		if pattern == nil {
@@ -853,7 +856,7 @@ func (nodeData *NodeData) GetMixinInfo(s *Schema) (*mixinInfo, error) {
 		})
 		extends.WriteString(pattern.GetMixinName())
 		extends.WriteString("(")
-		impls = append(impls, pattern.GetMixinInterfaceName())
+		impls = append(impls, fmt.Sprintf("%s<%s>", pattern.GetMixinInterfaceName(), viewerType))
 		interfaces = append(interfaces, pattern.GetMixinInterfaceName())
 	}
 	if len(interfaces) == 0 {

diff --git a/internal/tscode/base.tmpl b/internal/tscode/base.tmpl
@@ -99,7 +99,7 @@
 
 
 {{$hasMixins := .HasMixins -}}
-{{$mixinInfo := .GetMixinInfo $schema -}}
+{{$mixinInfo := .GetMixinInfo $schema $cfg -}}
 
 export class {{$baseClass}} 
 {{ if $hasMixins -}}

diff --git a/internal/tscode/mixin.tmpl b/internal/tscode/mixin.tmpl
@@ -4,9 +4,13 @@
 {{$cfg := .Config}}
 {{$schema := .Schema}}
 
+{{$viewerInfo := $cfg.GetTemplatizedViewer -}}
+{{ reserveImportPath $viewerInfo.GetImportPath false -}}
+{{$viewerType := useImport $viewerInfo.GetImport -}}
+
 {{ reserveImport $p.GetImportPathForMixinBase  $p.GetMixinBaseName $p.GetPatternMethod $p.GetMixinInterfaceBaseName -}}
 
-export interface {{$p.GetMixinInterfaceName}} <TViewer extends {{useImport "Viewer"}} = Viewer>
+export interface {{$p.GetMixinInterfaceName}} <TViewer extends {{useImport $viewerType}} = {{useImport $viewerType}}>
   extends {{useImport $p.GetMixinInterfaceBaseName }}<TViewer> {
 
   {{$p.GetPatternMethod}}(): boolean;

diff --git a/internal/tscode/mixin_base.tmpl b/internal/tscode/mixin_base.tmpl
@@ -4,11 +4,15 @@
 {{$cfg := .Config}}
 {{$schema := .Schema}}
 
+{{$viewerInfo := $cfg.GetTemplatizedViewer -}}
+{{ reserveImportPath $viewerInfo.GetImportPath false -}}
+{{$viewerType := useImport $viewerInfo.GetImport -}}
+
 {{ range $p.GetImportsForMixin $schema $cfg -}} 
   {{ reserveImportPath . false -}}
 {{ end}}
 
-export interface {{$p.GetMixinInterfaceBaseName}}<TViewer extends {{useImport "Viewer"}} = Viewer> extends {{useImport "Ent" }}<TViewer> {
+export interface {{$p.GetMixinInterfaceBaseName}}<TViewer extends {{useImport $viewerType}} = {{useImport $viewerType}}> extends {{useImport "Ent" }}<TViewer> {
   {{ range $field := $p.FieldInfo.EntFields -}}
     {{ range $field.GetTsTypeImports -}}
       {{ if ($p.ForeignImport .Import) -}}