@goast/core 0.3.3 → 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");
@@ -18,7 +19,8 @@ function determineSchemaKind(ctx, schema) {
         return 'oneOf';
     }
     else if (schema.type !== 'object' && (schema.allOf || schema.anyOf)) {
-        return 'combined';
+        const hasProperties = (schema.properties && Object.keys(schema.properties).length > 0) || schema.additionalProperties;
+        return hasProperties ? 'object' : 'combined';
     }
     else if (Array.isArray(schema.type)) {
         return 'multi-type';
@@ -45,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 };
@@ -76,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/cjs/lib/transform/transform-schema.js

@@ -79,76 +79,57 @@ function transformSchema(ctx, schema) {
     ctx.schemas.set(schemaSource, completeSchema);
     return completeSchema;
 }
-const schemaTransformers = {
-    oneOf: (schema, context) => {
-        var _a, _b;
-        return ({
-            oneOf: (_b = (_a = schema.oneOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-        });
-    },
-    string: (schema) => ({
-        type: 'string',
+function allExtensionsTransformer(schema, context) {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+        oneOf: (_b = (_a = schema.oneOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
         format: schema.format,
         pattern: schema.pattern,
         minLength: schema.minLength,
         maxLength: schema.maxLength,
-    }),
-    number: (schema) => ({
-        type: 'number',
-        format: schema.format,
         minimum: schema.minimum,
         maximum: schema.maximum,
+        properties: (0, helpers_1.transformSchemaProperties)(context, schema, transformSchema),
+        additionalProperties: (0, helpers_1.transformAdditionalProperties)(context, schema, transformSchema),
+        allOf: (_d = (_c = schema.allOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
+        anyOf: (_f = (_e = schema.anyOf) === null || _e === void 0 ? void 0 : _e.map((s) => transformSchema(context, s))) !== null && _f !== void 0 ? _f : [],
+        items: schema.items ? transformSchema(context, schema.items) : undefined,
+        minItems: schema.minItems,
+        maxItems: schema.maxItems,
+    };
+}
+const schemaTransformers = {
+    oneOf: (schema, context) => ({
+        ...allExtensionsTransformer(schema, context),
+    }),
+    string: (schema, context) => ({
+        type: 'string',
+        ...allExtensionsTransformer(schema, context),
+    }),
+    number: (schema, context) => ({
+        type: 'number',
+        ...allExtensionsTransformer(schema, context),
     }),
-    boolean: (schema) => ({ type: 'boolean', format: schema.format }),
-    object: (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            type: 'object',
-            properties: (0, helpers_1.transformSchemaProperties)(context, schema, transformSchema),
-            format: schema.format,
-            additionalProperties: (0, helpers_1.transformAdditionalProperties)(context, schema, transformSchema),
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-        });
-    },
-    integer: (schema) => ({
+    boolean: (schema, context) => ({ type: 'boolean', ...allExtensionsTransformer(schema, context) }),
+    object: (schema, context) => ({
+        type: 'object',
+        ...allExtensionsTransformer(schema, context),
+    }),
+    integer: (schema, context) => ({
         type: 'integer',
-        format: schema.format,
-        minimum: schema.minimum,
-        maximum: schema.maximum,
+        ...allExtensionsTransformer(schema, context),
     }),
     array: (schema, context) => ({
         type: 'array',
-        items: schema.items ? transformSchema(context, schema.items) : undefined,
-        minItems: schema.minItems,
-        maxItems: schema.maxItems,
+        ...allExtensionsTransformer(schema, context),
+    }),
+    combined: (schema, context) => ({
+        ...allExtensionsTransformer(schema, context),
+    }),
+    'multi-type': (schema, context) => ({
+        type: schema.type,
+        ...allExtensionsTransformer(schema, context),
     }),
-    combined: (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-        });
-    },
-    'multi-type': (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            type: schema.type,
-            items: schema.items ? transformSchema(context, schema.items) : undefined,
-            minItems: schema.minItems,
-            maxItems: schema.maxItems,
-            minimum: schema.minimum,
-            maximum: schema.maximum,
-            format: schema.format,
-            properties: (0, helpers_1.transformSchemaProperties)(context, schema, transformSchema),
-            additionalProperties: (0, helpers_1.transformAdditionalProperties)(context, schema, transformSchema),
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-            maxLength: schema.maxLength,
-            minLength: schema.minLength,
-            pattern: schema.pattern,
-        });
-    },
     null: () => ({ type: 'null' }),
     unknown: () => ({}),
 };

package/cjs/lib/utils/schema.utils.js

@@ -9,6 +9,9 @@ function resolveAnyOfAndAllOf(schema, ignoreNonObjectParts) {
     }
     const required = new Set(schema.required);
     const properties = new Map();
+    if ('properties' in schema) {
+        schema.properties.forEach((prop) => properties.set(prop.name, prop));
+    }
     collectSubSchemaProperties(schema.allOf, properties, required, false);
     collectSubSchemaProperties(schema.anyOf, properties, required, true);
     const initialAdditionalProperties = schema.kind === 'object' ? schema.additionalProperties : undefined;

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';
@@ -6,7 +7,8 @@ export function determineSchemaKind(ctx, schema) {
         return 'oneOf';
     }
     else if (schema.type !== 'object' && (schema.allOf || schema.anyOf)) {
-        return 'combined';
+        const hasProperties = (schema.properties && Object.keys(schema.properties).length > 0) || schema.additionalProperties;
+        return hasProperties ? 'object' : 'combined';
     }
     else if (Array.isArray(schema.type)) {
         return 'multi-type';
@@ -33,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 };
@@ -64,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/esm/lib/transform/transform-schema.js

@@ -76,76 +76,57 @@ export function transformSchema(ctx, schema) {
     ctx.schemas.set(schemaSource, completeSchema);
     return completeSchema;
 }
-const schemaTransformers = {
-    oneOf: (schema, context) => {
-        var _a, _b;
-        return ({
-            oneOf: (_b = (_a = schema.oneOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-        });
-    },
-    string: (schema) => ({
-        type: 'string',
+function allExtensionsTransformer(schema, context) {
+    var _a, _b, _c, _d, _e, _f;
+    return {
+        oneOf: (_b = (_a = schema.oneOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
         format: schema.format,
         pattern: schema.pattern,
         minLength: schema.minLength,
         maxLength: schema.maxLength,
-    }),
-    number: (schema) => ({
-        type: 'number',
-        format: schema.format,
         minimum: schema.minimum,
         maximum: schema.maximum,
+        properties: transformSchemaProperties(context, schema, transformSchema),
+        additionalProperties: transformAdditionalProperties(context, schema, transformSchema),
+        allOf: (_d = (_c = schema.allOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
+        anyOf: (_f = (_e = schema.anyOf) === null || _e === void 0 ? void 0 : _e.map((s) => transformSchema(context, s))) !== null && _f !== void 0 ? _f : [],
+        items: schema.items ? transformSchema(context, schema.items) : undefined,
+        minItems: schema.minItems,
+        maxItems: schema.maxItems,
+    };
+}
+const schemaTransformers = {
+    oneOf: (schema, context) => ({
+        ...allExtensionsTransformer(schema, context),
+    }),
+    string: (schema, context) => ({
+        type: 'string',
+        ...allExtensionsTransformer(schema, context),
+    }),
+    number: (schema, context) => ({
+        type: 'number',
+        ...allExtensionsTransformer(schema, context),
     }),
-    boolean: (schema) => ({ type: 'boolean', format: schema.format }),
-    object: (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            type: 'object',
-            properties: transformSchemaProperties(context, schema, transformSchema),
-            format: schema.format,
-            additionalProperties: transformAdditionalProperties(context, schema, transformSchema),
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-        });
-    },
-    integer: (schema) => ({
+    boolean: (schema, context) => ({ type: 'boolean', ...allExtensionsTransformer(schema, context) }),
+    object: (schema, context) => ({
+        type: 'object',
+        ...allExtensionsTransformer(schema, context),
+    }),
+    integer: (schema, context) => ({
         type: 'integer',
-        format: schema.format,
-        minimum: schema.minimum,
-        maximum: schema.maximum,
+        ...allExtensionsTransformer(schema, context),
     }),
     array: (schema, context) => ({
         type: 'array',
-        items: schema.items ? transformSchema(context, schema.items) : undefined,
-        minItems: schema.minItems,
-        maxItems: schema.maxItems,
+        ...allExtensionsTransformer(schema, context),
+    }),
+    combined: (schema, context) => ({
+        ...allExtensionsTransformer(schema, context),
+    }),
+    'multi-type': (schema, context) => ({
+        type: schema.type,
+        ...allExtensionsTransformer(schema, context),
     }),
-    combined: (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-        });
-    },
-    'multi-type': (schema, context) => {
-        var _a, _b, _c, _d;
-        return ({
-            type: schema.type,
-            items: schema.items ? transformSchema(context, schema.items) : undefined,
-            minItems: schema.minItems,
-            maxItems: schema.maxItems,
-            minimum: schema.minimum,
-            maximum: schema.maximum,
-            format: schema.format,
-            properties: transformSchemaProperties(context, schema, transformSchema),
-            additionalProperties: transformAdditionalProperties(context, schema, transformSchema),
-            allOf: (_b = (_a = schema.allOf) === null || _a === void 0 ? void 0 : _a.map((s) => transformSchema(context, s))) !== null && _b !== void 0 ? _b : [],
-            anyOf: (_d = (_c = schema.anyOf) === null || _c === void 0 ? void 0 : _c.map((s) => transformSchema(context, s))) !== null && _d !== void 0 ? _d : [],
-            maxLength: schema.maxLength,
-            minLength: schema.minLength,
-            pattern: schema.pattern,
-        });
-    },
     null: () => ({ type: 'null' }),
     unknown: () => ({}),
 };

package/esm/lib/utils/schema.utils.js

@@ -5,6 +5,9 @@ export function resolveAnyOfAndAllOf(schema, ignoreNonObjectParts) {
     }
     const required = new Set(schema.required);
     const properties = new Map();
+    if ('properties' in schema) {
+        schema.properties.forEach((prop) => properties.set(prop.name, prop));
+    }
     collectSubSchemaProperties(schema.allOf, properties, required, false);
     collectSubSchemaProperties(schema.anyOf, properties, required, true);
     const initialAdditionalProperties = schema.kind === 'object' ? schema.additionalProperties : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/core",
-  "version": "0.3.3",
+  "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,19 +1,17 @@
 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;
     anyOf?: unknown;
     type?: string | string[];
     properties?: Record<string, unknown>;
+    additionalProperties?: unknown;
 }>(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;