Write out types in topological order

core/data/tests/can_generate_generic_enum/output.kt

@@ -9,11 +9,6 @@ package com.agilebits.onepassword
 import androidx.compose.runtime.NoLiveLiterals
 import kotlinx.serialization.*
 
-@Serializable
-data class StructUsingGenericEnum (
-	val enum_field: GenericEnum<String, Short>
-)
-
 @Serializable
 sealed class GenericEnum<A, B> {
 	@Serializable
@@ -24,6 +19,11 @@ sealed class GenericEnum<A, B> {
 	data class VariantB<A, B>(val content: B): GenericEnum<A, B>()
 }
 
+@Serializable
+data class StructUsingGenericEnum (
+	val enum_field: GenericEnum<String, Short>
+)
+
 @Serializable
 sealed class GenericEnumUsingGenericEnum<T> {
 	@Serializable

core/data/tests/can_generate_generic_enum/output.swift

@@ -4,14 +4,6 @@
 
 import Foundation
 
-public struct CoreStructUsingGenericEnum: Codable {
-	public let enum_field: CoreGenericEnum<String, Int16>
-
-	public init(enum_field: CoreGenericEnum<String, Int16>) {
-		self.enum_field = enum_field
-	}
-}
-
 public enum CoreGenericEnum<A: Codable, B: Codable>: Codable {
 	case variantA(A)
 	case variantB(B)
@@ -57,6 +49,14 @@ public enum CoreGenericEnum<A: Codable, B: Codable>: Codable {
 	}
 }
 
+public struct CoreStructUsingGenericEnum: Codable {
+	public let enum_field: CoreGenericEnum<String, Int16>
+
+	public init(enum_field: CoreGenericEnum<String, Int16>) {
+		self.enum_field = enum_field
+	}
+}
+
 public enum CoreGenericEnumUsingGenericEnum<T: Codable>: Codable {
 	case variantC(CoreGenericEnum<T, T>)
 	case variantD(CoreGenericEnum<String, [String: T]>)

core/data/tests/can_generate_generic_enum/output.ts

@@ -2,14 +2,14 @@
  Generated by typeshare 1.0.0
 */
 
-export interface StructUsingGenericEnum {
-	enum_field: GenericEnum<string, number>;
-}
-
 export type GenericEnum<A, B> = 
 	| { type: "VariantA", content: A }
 	| { type: "VariantB", content: B };
 
+export interface StructUsingGenericEnum {
+	enum_field: GenericEnum<string, number>;
+}
+
 export type GenericEnumUsingGenericEnum<T> = 
 	| { type: "VariantC", content: GenericEnum<T, T> }
 	| { type: "VariantD", content: GenericEnum<string, Record<string, T>> }

core/data/tests/orders_types/output.kt

@@ -0,0 +1,11 @@
+/**
+ * Generated by typeshare 1.0.0
+ */
+
+@file:NoLiveLiterals
+
+package com.agilebits.onepassword
+
+import androidx.compose.runtime.NoLiveLiterals
+import kotlinx.serialization.*
+

core/data/tests/orders_types/output.swift

@@ -0,0 +1,5 @@
+/*
+ Generated by typeshare 1.0.0
+ */
+
+import Foundation

core/src/language/go.rs

@@ -2,10 +2,11 @@ use std::io::Write;
 
 use crate::parser::ParsedData;
 use crate::rename::RenameExt;
-use crate::rust_types::{RustTypeFormatError, SpecialRustType};
+use crate::rust_types::{RustThing, RustTypeFormatError, SpecialRustType};
 use crate::{
     language::Language,
     rust_types::{RustEnum, RustEnumVariant, RustField, RustStruct, RustTypeAlias},
+    topsort::topsort,
 };
 use std::collections::{HashMap, HashSet};
 
@@ -36,16 +37,28 @@ impl Language for Go {
 
         self.begin_file(w)?;
 
+        let mut things: Vec<RustThing> = vec![];
+
         for a in &data.aliases {
-            self.write_type_alias(w, a)?;
+            things.push(RustThing::TypeAlias(a))
         }
 
         for s in &data.structs {
-            self.write_struct(w, s)?;
+            things.push(RustThing::Struct(s))
         }
 
         for e in &data.enums {
-            self.write_enum(w, e, &types_mapping_to_struct)?;
+            things.push(RustThing::Enum(e))
+        }
+
+        let sorted = topsort(things.iter().collect());
+
+        for &thing in &sorted {
+            match thing {
+                RustThing::Enum(e) => self.write_enum(w, e, &types_mapping_to_struct)?,
+                RustThing::Struct(s) => self.write_struct(w, s)?,
+                RustThing::TypeAlias(a) => self.write_type_alias(w, a)?,
+            }
         }
 
         self.end_file(w)?;

core/src/language/mod.rs

@@ -1,6 +1,7 @@
 use crate::{
     parser::ParsedData,
-    rust_types::{Id, RustEnum, RustEnumVariant, RustStruct, RustTypeAlias},
+    rust_types::{Id, RustEnum, RustEnumVariant, RustStruct, RustThing, RustTypeAlias},
+    topsort::topsort,
 };
 use itertools::Itertools;
 use std::{collections::HashMap, io::Write};
@@ -31,16 +32,28 @@ pub trait Language {
     ) -> std::io::Result<()> {
         self.begin_file(writable)?;
 
+        let mut things: Vec<RustThing> = vec![];
+
         for a in &data.aliases {
-            self.write_type_alias(writable, a)?;
+            things.push(RustThing::TypeAlias(a))
         }
 
         for s in &data.structs {
-            self.write_struct(writable, s)?;
+            things.push(RustThing::Struct(s))
         }
 
         for e in &data.enums {
-            self.write_enum(writable, e)?;
+            things.push(RustThing::Enum(e))
+        }
+
+        let sorted = topsort(things.iter().collect());
+
+        for &thing in &sorted {
+            match thing {
+                RustThing::Enum(e) => self.write_enum(writable, e)?,
+                RustThing::Struct(s) => self.write_struct(writable, s)?,
+                RustThing::TypeAlias(a) => self.write_type_alias(writable, a)?,
+            }
         }
 
         self.end_file(writable)?;

core/src/lib.rs

@@ -13,6 +13,7 @@ pub mod language;
 pub mod parser;
 /// Codifying Rust types and how they convert to various languages.
 pub mod rust_types;
+mod topsort;
 
 #[derive(Debug, Error)]
 #[allow(missing_docs)]

core/src/rust_types.rs

@@ -4,7 +4,7 @@ use std::{collections::HashMap, convert::TryFrom};
 use thiserror::Error;
 
 /// Identifier used in Rust structs, enums, and fields. It includes the `original` name and the `renamed` value after the transformation based on `serde` attributes.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Id {
     /// The original identifier name
     pub original: String,
@@ -25,7 +25,7 @@ impl std::fmt::Display for Id {
 }
 
 /// Rust struct.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct RustStruct {
     /// The identifier for the struct.
     pub id: Id,
@@ -45,7 +45,7 @@ pub struct RustStruct {
 /// ```
 /// pub struct MasterPassword(String);
 /// ```
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct RustTypeAlias {
     /// The identifier for the alias.
     pub id: Id,
@@ -58,7 +58,7 @@ pub struct RustTypeAlias {
 }
 
 /// Rust field definition.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct RustField {
     /// Identifier for the field.
     pub id: Id,
@@ -383,7 +383,7 @@ impl SpecialRustType {
 }
 
 /// Parsed information about a Rust enum definition
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum RustEnum {
     /// A unit enum
     ///
@@ -433,7 +433,7 @@ impl RustEnum {
 }
 
 /// Enum information shared among different enum types
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub struct RustEnumShared {
     /// The enum's ident
     pub id: Id,
@@ -453,7 +453,7 @@ pub struct RustEnumShared {
 }
 
 /// Parsed information about a Rust enum variant
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum RustEnumVariant {
     /// A unit variant
     Unit(RustEnumVariantShared),
@@ -485,10 +485,17 @@ impl RustEnumVariant {
 }
 
 /// Variant information shared among different variant types
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub struct RustEnumVariantShared {
     /// The variant's ident
     pub id: Id,
     /// Comments applied to the variant
     pub comments: Vec<String>,
 }
+
+#[derive(Debug, PartialEq)]
+pub enum RustThing<'a> {
+    Enum(&'a RustEnum),
+    TypeAlias(&'a RustTypeAlias),
+    Struct(&'a RustStruct),
+}