@goast/core 0.3.4 → 0.3.5

package/cjs/lib/collect/collector.js

@@ -11,6 +11,7 @@ function collectOpenApi(apis) {
     collectDocument(data, apis);
     return data;
 }
+const jsonSchemaProperties = ['$id', 'allOf', 'anyOf', 'oneOf', 'enum', 'not', 'properties', 'title', 'type'];
 function collectDocument(data, documents) {
     (0, helpers_1.collect)(data, documents, (data, document) => {
         var _a, _b, _c, _d, _e;
@@ -24,6 +25,9 @@ function collectDocument(data, documents) {
         (0, helpers_1.collectRecord)(data, (_d = document.components) === null || _d === void 0 ? void 0 : _d.responses, collectResponse);
         (0, helpers_1.collectRecord)(data, document.responses, collectResponse);
         (0, helpers_1.collectRecord)(data, (_e = document.components) === null || _e === void 0 ? void 0 : _e.headers, collectHeader);
+        if (Object.keys(document).some((key) => jsonSchemaProperties.includes(key))) {
+            collectSchema(data, document);
+        }
     });
 }
 function collectPaths(data, paths) {

package/cjs/lib/parse/parser.js

@@ -92,9 +92,9 @@ class OpenApiParser {
             absoluteRefFile = path_1.default.resolve(path_1.default.dirname(file), refFile);
         }
         const doc = await this.loadDocument(absoluteRefFile);
-        const value = getDeepProperty(doc.document, refPath.replace(/[/]/g, '.'));
+        const value = refPath ? getDeepProperty(doc.document, refPath.replace(/[/]/g, '.')) : doc.document;
         if (value && typeof value === 'object') {
-            return this.dereference(absoluteRefFile, refPath, value);
+            return this.dereference(absoluteRefFile, refPath !== null && refPath !== void 0 ? refPath : '/', value);
         }
         return undefined;
     }

package/cjs/lib/transform/helpers.js

@@ -10,6 +10,7 @@ exports.determineEndpointName = determineEndpointName;
 exports.transformAdditionalProperties = transformAdditionalProperties;
 exports.transformSchemaProperties = transformSchemaProperties;
 exports.getOpenApiObjectIdentifier = getOpenApiObjectIdentifier;
+const path_1 = require("path");
 const internal_utils_1 = require("../internal-utils");
 const utils_1 = require("../utils");
 const common_utils_1 = require("../utils/common.utils");
@@ -46,6 +47,8 @@ function determineSchemaName(schema, id) {
     if (!schema.$src) {
         console.log('woot?');
     }
+    if (schema.$src.path === '/')
+        return { name: (0, path_1.parse)(schema.$src.file).name, isGenerated: true };
     const schemaNameMatch = schema.$src.path.match(/(?<=\/components\/schemas\/|\/definitions\/)[^/]+$/i);
     if (schemaNameMatch) {
         return { name: schemaNameMatch[0], isGenerated: false };
@@ -77,7 +80,15 @@ function determineSchemaName(schema, id) {
     const parentSchemaMatch = schema.$src.path.match(/(.*)\/properties\/([^/]*)$/);
     if (parentSchemaMatch) {
         const parentSchema = (0, utils_1.getDeepProperty)(schema.$src.document, parentSchemaMatch[1].split('/').filter(Boolean));
-        const parentSchemaName = determineSchemaName({ title: parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.title, $src: { path: parentSchemaMatch[1], document: schema.$src.document } }, id);
+        const parentSchemaName = determineSchemaName({
+            title: parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.title,
+            $src: {
+                file: schema.$src.file,
+                path: parentSchemaMatch[1],
+                document: schema.$src.document,
+                originalComponent: parentSchema,
+            },
+        }, id);
         if (!parentSchemaName.isGenerated) {
             return { name: `${parentSchemaName.name}_${parentSchemaMatch[2]}`, isGenerated: true };
         }

package/esm/lib/collect/collector.js

@@ -8,6 +8,7 @@ export function collectOpenApi(apis) {
     collectDocument(data, apis);
     return data;
 }
+const jsonSchemaProperties = ['$id', 'allOf', 'anyOf', 'oneOf', 'enum', 'not', 'properties', 'title', 'type'];
 function collectDocument(data, documents) {
     collect(data, documents, (data, document) => {
         var _a, _b, _c, _d, _e;
@@ -21,6 +22,9 @@ function collectDocument(data, documents) {
         collectRecord(data, (_d = document.components) === null || _d === void 0 ? void 0 : _d.responses, collectResponse);
         collectRecord(data, document.responses, collectResponse);
         collectRecord(data, (_e = document.components) === null || _e === void 0 ? void 0 : _e.headers, collectHeader);
+        if (Object.keys(document).some((key) => jsonSchemaProperties.includes(key))) {
+            collectSchema(data, document);
+        }
     });
 }
 function collectPaths(data, paths) {

package/esm/lib/parse/parser.js

@@ -88,9 +88,9 @@ export class OpenApiParser {
             absoluteRefFile = path.resolve(path.dirname(file), refFile);
         }
         const doc = await this.loadDocument(absoluteRefFile);
-        const value = getDeepProperty(doc.document, refPath.replace(/[/]/g, '.'));
+        const value = refPath ? getDeepProperty(doc.document, refPath.replace(/[/]/g, '.')) : doc.document;
         if (value && typeof value === 'object') {
-            return this.dereference(absoluteRefFile, refPath, value);
+            return this.dereference(absoluteRefFile, refPath !== null && refPath !== void 0 ? refPath : '/', value);
         }
         return undefined;
     }

package/esm/lib/transform/helpers.js

@@ -1,3 +1,4 @@
+import { parse as parsePath } from 'path';
 import { isOpenApiObjectProperty } from '../internal-utils';
 import { getDeepProperty } from '../utils';
 import { isNullish } from '../utils/common.utils';
@@ -34,6 +35,8 @@ export function determineSchemaName(schema, id) {
     if (!schema.$src) {
         console.log('woot?');
     }
+    if (schema.$src.path === '/')
+        return { name: parsePath(schema.$src.file).name, isGenerated: true };
     const schemaNameMatch = schema.$src.path.match(/(?<=\/components\/schemas\/|\/definitions\/)[^/]+$/i);
     if (schemaNameMatch) {
         return { name: schemaNameMatch[0], isGenerated: false };
@@ -65,7 +68,15 @@ export function determineSchemaName(schema, id) {
     const parentSchemaMatch = schema.$src.path.match(/(.*)\/properties\/([^/]*)$/);
     if (parentSchemaMatch) {
         const parentSchema = getDeepProperty(schema.$src.document, parentSchemaMatch[1].split('/').filter(Boolean));
-        const parentSchemaName = determineSchemaName({ title: parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.title, $src: { path: parentSchemaMatch[1], document: schema.$src.document } }, id);
+        const parentSchemaName = determineSchemaName({
+            title: parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.title,
+            $src: {
+                file: schema.$src.file,
+                path: parentSchemaMatch[1],
+                document: schema.$src.document,
+                originalComponent: parentSchema,
+            },
+        }, id);
         if (!parentSchemaName.isGenerated) {
             return { name: `${parentSchemaName.name}_${parentSchemaMatch[2]}`, isGenerated: true };
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/core",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "A tool designed to transform OpenAPI specifications into various forms with flexibility and extensibility at its core.",
   "keywords": [

package/types/lib/transform/helpers.d.ts

@@ -1,6 +1,6 @@
 import { ApiSchemaKind, ApiSchemaAccessibility, ApiSchema, ApiSchemaProperty } from './api-types';
 import { OpenApiTransformerContext } from './types';
-import { Deref, OpenApiDocument, OpenApiObject } from '../parse';
+import { Deref, DerefSource, OpenApiObject } from '../parse';
 export declare function determineSchemaKind<T extends {
     oneOf?: unknown;
     allOf?: unknown;
@@ -11,10 +11,7 @@ export declare function determineSchemaKind<T extends {
 }>(ctx: OpenApiTransformerContext, schema: T): ApiSchemaKind;
 export declare function determineSchemaName(schema: {
     title?: string;
-    $src: {
-        path: string;
-        document: Deref<OpenApiDocument>;
-    };
+    $src: DerefSource<any>;
 }, id: string): {
     name: string;
     isGenerated: boolean;