Refactor JSON schema by removing empty "enum" arrays

Mearman · Jan 31, 2024 · 13576f7 · 13576f7
1 parent a126b42
commit 13576f7
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 40 deletions.
diff --git a/__tests__/clients/typescript-fetch/index.test.ts b/__tests__/clients/typescript-fetch/index.test.ts
@@ -1,6 +1,8 @@
 import * as OpenAlexApi from "@mearman/openalex-typescript-fetch";
 import { wait } from "../../util/wait";
 
+jest.retryTimes(3, {logErrorsBeforeRetry: true});
+
 describe("InfoApi", () => {
 	const infoApi = new OpenAlexApi.InfoApi()
 	test("getRoot", async () => {

diff --git a/__tests__/clients/typescript-node/index.test.ts b/__tests__/clients/typescript-node/index.test.ts
@@ -1,6 +1,8 @@
 import * as OpenAlexApi from "@mearman/openalex-typescript-node";
 import { wait } from "../../util/wait";
 
+jest.retryTimes(3, {logErrorsBeforeRetry: true});
+
 describe("InfoApi", () => {
 	const infoApi = new OpenAlexApi.InfoApi()
 	test("getRoot", async () => {

diff --git a/__tests__/clients/typescript/index.test.ts b/__tests__/clients/typescript/index.test.ts
@@ -1,21 +1,11 @@
-// import * as OpenAlex from "@mearman/openalex-typescript";
-//
-// describe("typescript", () => {
-// 	const infoApi = new OpenAlex.InfoApi(OpenAlex.createConfiguration());
-//
-// 	it("should work", async () => {
-// 		const response = await infoApi.getRoot()
-// 		expect(response).toBeDefined();
-// 		console.log(response);
-// 	})
-// })
+import { createConfiguration, InfoApi } from "@mearman/openalex-typescript/dist/index";
 
-import * as Api from "@mearman/openalex-typescript";
 
-console.log(Object.keys(Api));
-
-describe("typescript-node", () => {
-	it("should work", () => {
-		expect(true).toBe(true);
-	});
+describe("InfoApi", () => {
+	let configuration = createConfiguration();
+	const infoApi = new InfoApi(configuration)
+	test("getRoot", async () => {
+		const response = await infoApi.getRoot()
+		expect(response).toBeDefined();
+	})
 })
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -46,6 +46,7 @@ const namedDocs: [string, string][] = [
 	["3.0 Dereferenced", "generated/openapi.dereferenced.3.0.json"],
 ]
 describe.each(namedDocs)(`%s`, (name, location) => {
+	console.log("reading", name, "from", location)
 	const doc: OpenAPI.Document = JSON.parse(fs.readFileSync(location).toString())
 	jestOpenAPI(doc as unknown as OpenAPI.Document);
 	test("Root url", async () => {

diff --git a/generated/clients/python-pydantic-v1 b/generated/clients/python-pydantic-v1
diff --git a/generated/openapi.3.0.json b/generated/openapi.3.0.json
@@ -3450,7 +3450,6 @@
 			"workSelectSchema": {
 				"type": "array",
 				"items": {
-					"enum": [],
 					"allOf": [
 						{
 							"$ref": "#/components/schemas/workAttributes"

diff --git a/generated/openapi.dereferenced.3.0.json b/generated/openapi.dereferenced.3.0.json
@@ -17069,7 +17069,6 @@
 										"type": "string"
 									}
 								],
-								"enum": [],
 								"type": "string"
 							},
 							"type": "array"
@@ -18025,7 +18024,6 @@
 										"type": "string"
 									}
 								],
-								"enum": [],
 								"type": "string"
 							},
 							"type": "array"

diff --git a/generated/openapi.dereferenced.json b/generated/openapi.dereferenced.json
@@ -17440,7 +17440,6 @@
 										"type": "string"
 									}
 								],
-								"enum": [],
 								"type": "string"
 							},
 							"type": "array"
@@ -18490,7 +18489,6 @@
 										"type": "string"
 									}
 								],
-								"enum": [],
 								"type": "string"
 							},
 							"type": "array"

diff --git a/generated/openapi.json b/generated/openapi.json
@@ -3850,7 +3850,6 @@
 							"$ref": "#/components/schemas/baseSelectionAttributes"
 						}
 					],
-					"enum": [],
 					"type": "string"
 				},
 				"type": "array"

diff --git a/jest.config.ts b/jest.config.ts
@@ -9,11 +9,12 @@ import { jsWithTsESM } from 'ts-jest/presets';
 // import { jsWithBabelESM  } from 'ts-jest/presets';
 
 const jestConfig: JestConfigWithTsJest = {
+	maxConcurrency: 1,
+	testEnvironment: 'node',
 	transform: {
 		...jsWithTsESM.transform,
 	},
 	verbose: true,
-	testEnvironment: 'node'
 };
 
 export default jestConfig;
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
 		"@types/uuid": "^9.0.7",
 		"axios": "^1.6.5",
 		"jest": "^29.7.0",
+		"jest-expect-openapi": "^1.0.0",
 		"jest-openapi": "^0.14.2",
 		"json-schema-to-ts": "^3.0.0",
 		"rimraf": "^5.0.5",
@@ -41,7 +42,7 @@
 	},
 	"scripts": {
 		"build": "wireit",
-		"build:client:typescript": "wireit",
+		"build:client:typescript": "yarn workspaces foreach -A run build",
 		"build:generated": "yarn workspaces foreach -A run tsc --noEmit",
 		"convert:markdown:notebook": "wireit",
 		"generate": "wireit",
@@ -63,15 +64,6 @@
 				"openapitools.json"
 			]
 		},
-		"build:client:typescript": {
-			"dependencies": [
-				"generate:code",
-				"./generated/clients/typescript:build"
-			],
-			"files": [
-				"./src/**/*.ts"
-			]
-		},
 		"build:clients": {
 			"dependencies": [
 				"build:client:typescript"

diff --git a/src/spec/components/paramaters/workAttributeSelectionParameter.ts b/src/spec/components/paramaters/workAttributeSelectionParameter.ts
@@ -5,10 +5,9 @@ import { workAttributes } from "~/spec/components/schemas/works/workAttributes";
 const workSelectSchema: SchemaObject = {
 	type: "array",
 	items: {
-		enum: [],
 		allOf: [
-			refSchema({ workAttributes }),
-			refSchema({ baseSelectionAttributes }),
+			refSchema({workAttributes}),
+			refSchema({baseSelectionAttributes}),
 		],
 		type: "string",
 	}
@@ -20,5 +19,5 @@ export const workAttributeSelectionParameter: ParameterObject = {
 	required: false,
 	style: "form",
 	explode: false,
-	schema: refSchema({ workSelectSchema }),
+	schema: refSchema({workSelectSchema}),
 } satisfies ParameterObject;
+0 −1		.openapi-generator/FILES
+19 −0		README.md
+1 −1		docs/AuthorsApi.md
+444 −0		docs/RandomApi.md
+974 −0		docs/SingleApi.md
+2 −2		openalex_api/api/authors_api.py
+949 −1		openalex_api/api/random_api.py
+2,096 −1		openalex_api/api/single_api.py