Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/quicktype-core/src/MakeTransformations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ function makeEnumTransformer(
stringType: TypeRef,
continuation?: Transformer,
): Transformer {
const sortedCases = Array.from(enumType.cases).sort();
const caseTransformers = sortedCases.map(
const caseTransformers = Array.from(enumType.cases).map(
(c) =>
new StringMatchTransformer(
graph,
Expand Down
46 changes: 31 additions & 15 deletions test/unit/enum-order.test.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,39 @@
import {
InputData,
JSONSchemaInput,
quicktype,
} from "../../packages/quicktype-core/src/index.js";
import { InputData, JSONSchemaInput, quicktype } from "quicktype-core";
import { expect, test } from "vitest";

const schema = JSON.stringify({
$schema: "http://json-schema.org/draft-04/schema#",
title: "Test",
type: "object",
properties: {
errorCode: {
test("preserves JSON Schema enum case order (C#)", async () => {
const schemaInput = new JSONSchemaInput(undefined);
await schemaInput.addSource({
name: "DaySchema",
schema: JSON.stringify({
$schema: "http://json-schema.org/draft-07/schema#",
type: "string",
enum: ["B", "A", "E"],
},
},
enum: ["Monday", "Tuesday", "Friday", "Sunday"],
}),
});
const inputData = new InputData();
inputData.addInput(schemaInput);

const result = await quicktype({ inputData, lang: "csharp" });

expect(result.lines.join("\n")).toContain(
"public enum DaySchemaEnum { Monday, Tuesday, Friday, Sunday };",
);
});

test("preserves JSON Schema enum case order", async () => {
test("preserves JSON Schema enum case order (C++)", async () => {
const schema = JSON.stringify({
$schema: "http://json-schema.org/draft-04/schema#",
title: "Test",
type: "object",
properties: {
errorCode: {
type: "string",
enum: ["B", "A", "E"],
},
},
});

const schemaInput = new JSONSchemaInput(undefined);
await schemaInput.addSource({ name: "Test", schema });

Expand Down
Loading