Develop

.github/workflows/release.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: "20.x"
+          node-version: "24.x"
       - run: npm ci
       - run: npm run build --if-present
       - run: npm test

.github/workflows/test.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: "20.x"
+          node-version: "24.x"
       - run: npm ci
       # - run: npm run build --if-present
       - run: npm test

package.json

@@ -6,7 +6,7 @@
   "module": "dist/generator.es.js",
   "type": "module",
   "engines": {
-    "node": "20"
+    "node": "24"
   },
   "scripts": {
     "test": "vitest",
@@ -34,33 +34,33 @@
   },
   "homepage": "https://github.com/nuxtus/generator#readme",
   "devDependencies": {
-    "@babel/core": "7.23.9",
-    "@babel/preset-env": "7.23.9",
-    "@rollup/plugin-babel": "6.0.4",
-    "@rollup/plugin-commonjs": "25.0.7",
-    "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-typescript": "11.1.6",
+    "@babel/core": "7.29.0",
+    "@babel/preset-env": "7.29.0",
+    "@rollup/plugin-babel": "7.0.0",
+    "@rollup/plugin-commonjs": "29.0.2",
+    "@rollup/plugin-node-resolve": "16.0.3",
+    "@rollup/plugin-typescript": "12.3.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/github": "9.2.6",
     "@semantic-release/release-notes-generator": "12.1.0",
     "@types/nunjucks": "3.2.6",
-    "@typescript-eslint/eslint-plugin": "7.0.2",
-    "eslint": "8.56.0",
-    "rollup": "4.12.0",
+    "@typescript-eslint/eslint-plugin": "8.57.0",
+    "eslint": "10.0.3",
+    "rollup": "4.59.0",
     "rollup-plugin-copy-assets": "2.0.3",
-    "semantic-release": "23.0.2",
-    "tslib": "2.6.2",
-    "typescript": "5.3.3",
-    "vitest": "1.3.1"
+    "semantic-release": "23.1.1",
+    "tslib": "2.8.1",
+    "typescript": "5.9.3",
+    "vitest": "4.1.0"
   },
   "dependencies": {
-    "@directus/sdk": "^15.0.0",
-    "camelcase": "^8.0.0",
+    "@directus/sdk": "^21.0.0",
+    "camelcase": "^9.0.0",
     "chalk": "^5.0.1",
     "nanoid": "^5.0.5",
     "nunjucks": "^3.2.3",
-    "openapi-typescript": "^6.0.0"
+    "openapi-typescript": "^7.0.0"
   },
   "release": {
     "branches": "main",
@@ -120,6 +120,6 @@
     ]
   },
   "volta": {
-    "node": "20.11.1"
+    "node": "24.14.0"
   }
 }

src/types.ts

@@ -1,5 +1,5 @@
 import { OpenApiSpecOutput, readOpenApiSpec } from "@directus/sdk"
-import openapiTS, { OpenAPI3 } from "openapi-typescript"
+import openapiTS, { astToString, OpenAPI3 } from "openapi-typescript"
 
 import Chalk from "chalk"
 import type { Directus } from "."
@@ -15,7 +15,8 @@ export async function createTypes(
 	if (chalk === undefined) chalk = Chalk
 	try {
 		const openapi: OpenApiSpecOutput = await directus.request(readOpenApiSpec())
-		const types = await openapiTS(openapi as OpenAPI3)
+		const ast = await openapiTS(openapi as OpenAPI3)
+		const types = astToString(ast)
 		if (!fs.existsSync("interfaces")) {
 			fs.mkdirSync("interfaces")
 		}

test/index.test.ts

@@ -3,6 +3,41 @@ import { afterAll, afterEach, beforeAll, expect, test, vi } from "vitest"
 import Generator from "../src/index"
 import fs from "node:fs"
 
+vi.mock("@directus/sdk", () => {
+	const createDirectus = vi.fn().mockImplementation(() => {
+		return {
+			with: vi.fn().mockImplementation(() => {
+				return {
+					with: vi.fn().mockImplementation(() => {
+						return {
+							login: vi.fn(),
+							request: vi.fn().mockImplementation(() => {
+								return {
+									openapi: "3.0.0",
+									components: {},
+								}
+							}),
+							setToken: vi.fn(),
+						}
+					}),
+				}
+			}),
+		}
+	})
+
+	const rest = vi.fn().mockImplementation(() => {
+		return {}
+	})
+
+	const authentication = vi.fn().mockImplementation(() => {
+		return {}
+	})
+
+	const readOpenApiSpec = vi.fn()
+
+	return { createDirectus, rest, authentication, readOpenApiSpec }
+})
+
 let nuxtus: Generator
 const envBackup = process.env
 
@@ -11,41 +46,6 @@ beforeAll(() => {
 	vi.stubEnv("NUXTUS_DIRECTUS_ADMIN_EMAIL", "admin@example.com")
 	vi.stubEnv("NUXTUS_DIRECTUS_ADMIN_PASSWORD", "password")
 
-	vi.mock("@directus/sdk", () => {
-		const createDirectus = vi.fn().mockImplementation(() => {
-			return {
-				with: vi.fn().mockImplementation(() => {
-					return {
-						with: vi.fn().mockImplementation(() => {
-							return {
-								login: vi.fn(),
-								request: vi.fn().mockImplementation(() => {
-									return {
-										openapi: "3.0.0",
-										components: {},
-									}
-								}),
-								setToken: vi.fn(),
-							}
-						}),
-					}
-				}),
-			}
-		})
-
-		const rest = vi.fn().mockImplementation(() => {
-			return {}
-		})
-
-		const authentication = vi.fn().mockImplementation(() => {
-			return {}
-		})
-
-		const readOpenApiSpec = vi.fn()
-
-		return { createDirectus, rest, authentication, readOpenApiSpec }
-	})
-
 	nuxtus = new Generator()
 })
 

test/mocks/openapi.json

@@ -7201,7 +7201,7 @@
 			"patch": {
 				"summary": "Update an Extension",
 				"description": "Update an existing extension.",
-				"operationId": "updateExtensions",
+				"operationId": "updateBundledExtension",
 				"parameters": [
 					{
 						"in": "path",

test/types.test.ts

@@ -1,12 +1,13 @@
 import { afterAll, afterEach, beforeAll, expect, test, vi } from "vitest"
 
 import fs from "node:fs"
-import openapiTS from "openapi-typescript"
+import openapiTS, { astToString } from "openapi-typescript"
 
 // Test open API to typescript conversion
 test("Convert open API to Typescript", async () => {
 	const openapiJSON = fs.readFileSync("./test/mocks/openapi.json", "utf-8")
 	const openapi = JSON.parse(openapiJSON)
-	const types = await openapiTS(openapi)
+	const ast = await openapiTS(openapi)
+	const types = astToString(ast)
 	expect(types).toContain("ItemsTestNuxtus")
 })