fix(typegen): view relationships ordering

soedirgo · soedirgo · commit 3956d437601b · 2024-10-19T16:31:42.000+08:00
diff --git a/src/server/templates/typescript.ts b/src/server/templates/typescript.ts
@@ -231,8 +231,10 @@ export type Database = {
                           relationship.referenced_schema === view.schema &&
                           relationship.relation === view.name
                       )
-                      .sort(({ foreign_key_name: a }, { foreign_key_name: b }) =>
-                        a.localeCompare(b)
+                      .sort(
+                        (a, b) =>
+                          a.foreign_key_name.localeCompare(b.foreign_key_name) ||
+                          a.referenced_relation.localeCompare(b.referenced_relation)
                       )
                       .map(
                         (relationship) => `{

Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,10 @@ export type Database = {`
`231`	`231`	`relationship.referenced_schema === view.schema &&`
`232`	`232`	`relationship.relation === view.name`
`233`	`233`	`)`
`234`		`- .sort(({ foreign_key_name: a }, { foreign_key_name: b }) =>`
`235`		`- a.localeCompare(b)`
	`234`	`+ .sort(`
	`235`	`+ (a, b) =>`
	`236`	`+ a.foreign_key_name.localeCompare(b.foreign_key_name) \|\|`
	`237`	`+ a.referenced_relation.localeCompare(b.referenced_relation)`
`236`	`238`	`)`
`237`	`239`	`.map(`
`238`	`240`	(relationship) => `{