Merge pull request #23 from acrontum/fix/root-ref-models

fix/root-ref-models

Author: p-mcgowan

package-lock.json

@@ -31,7 +31,7 @@
     "@types/node": "^22.13.1",
     "@types/nunjucks": "^3.2.6",
     "auto-changelog": "^2.5.0",
-    "boats": "^5.1.2",
+    "boats": "^5.1.3",
     "prettier": "^3.5.1",
     "source-map-support": "^0.5.21",
     "typescript": "^5.4.5"

package.json

@@ -119,7 +119,7 @@ export const getModelTasks = (options: ModelGenerationOptions): GenerationTask[]
     generate: !options['no-model'] && !options.type,
   });
 
-  const paginationRef = getRootRef('../pagination/model.yml', '#/components/PaginationModel', options.rootRef);
+  const paginationRef = getRootRef('../pagination/model.yml', '#/components/schemas/PaginationModel', options.rootRef);
   if (options.type) {
     tasks.push({
       contents: () => getParam(options.name, options.type as Exclude<(typeof options)['type'], undefined>),

src/subcommands/model.ts

@@ -181,7 +181,7 @@ export const getPathTasks = (options: PathGenerationOptions): GenerationTask[] =
   const dashName = dashCase(singleModelName);
   const singularName = camelCase(singleModelName);
 
-  const paginationRef = getRootRef('../pagination/model.yml', '#/components/PaginationModel', options.rootRef);
+  const paginationRef = getRootRef('../pagination/model.yml', '#/components/schemas/PaginationModel', options.rootRef);
 
   if (options.list) {
     const filename = `src/paths/${normalizedBaseFilepath}/get.yml`;

src/subcommands/path.ts

@@ -333,7 +333,7 @@ describe('e2e.spec.ts', async () => {
           - "data"
         properties:
           meta:
-            $ref: "#/components/Pagination"
+            $ref: "#/components/schemas/Pagination"
           data:
             type: "array"
             items:
@@ -351,7 +351,7 @@ describe('e2e.spec.ts', async () => {
           - "data"
         properties:
           meta:
-            $ref: "#/components/Pagination"
+            $ref: "#/components/schemas/Pagination"
           data:
             type: "array"
             items:
@@ -582,7 +582,7 @@ describe('e2e.spec.ts', async () => {
           - "data"
         properties:
           meta:
-            $ref: "#/components/PaginationModel"
+            $ref: "#/components/schemas/PaginationModel"
           data:
             type: "array"
             items:
@@ -600,7 +600,7 @@ describe('e2e.spec.ts', async () => {
           - "data"
         properties:
           meta:
-            $ref: "#/components/PaginationModel"
+            $ref: "#/components/schemas/PaginationModel"
           data:
             type: "array"
             items: