@goast/core 0.3.4 → 0.3.6

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/index.js

@@ -1,5 +1,5 @@
-export * from './lib/ast';
-export * from './lib/codegen';
-export * from './lib/parse';
-export * from './lib/transform';
-export * from './lib/utils';
+export * from './lib/ast/index.js';
+export * from './lib/codegen/index.js';
+export * from './lib/parse/index.js';
+export * from './lib/transform/index.js';
+export * from './lib/utils/index.js';

package/esm/lib/ast/index.js

@@ -1 +1 @@
-export * from './node';
+export * from './node.js';

package/esm/lib/codegen/config.js

@@ -1,5 +1,5 @@
-import { defaultOpenApiTransformerOptions } from '../transform/types';
-import { defaultSourceBuilderOptions } from '../utils/source-builder';
+import { defaultOpenApiTransformerOptions } from '../transform/types.js';
+import { defaultSourceBuilderOptions } from '../utils/source-builder.js';
 export const defaultOpenApiGeneratorConfig = {
     ...defaultSourceBuilderOptions,
     ...defaultOpenApiTransformerOptions,

package/esm/lib/codegen/endpoints-generator.js

@@ -1,5 +1,5 @@
-import { OpenApiGenerationProviderBase } from './generator';
-import { addSourceIfTest } from './internal-utils';
+import { OpenApiGenerationProviderBase } from './generator.js';
+import { addSourceIfTest } from './internal-utils.js';
 export class OpenApiEndpointsGenerationProviderBase extends OpenApiGenerationProviderBase {
     getProviderContext(context, config, defaultConfig) {
         const ctx = super.getProviderContext(context, config, defaultConfig);

package/esm/lib/codegen/generator.js

@@ -1,9 +1,9 @@
 import { resolve } from 'path';
 import { emptyDir, ensureDir } from 'fs-extra';
-import { defaultOpenApiGeneratorConfig } from './config';
-import { OpenApiParser } from '../parse/parser';
-import { ActionProvider } from '../utils/action-provider';
-import { getFiles } from '../utils/file-system.utils';
+import { defaultOpenApiGeneratorConfig } from './config.js';
+import { OpenApiParser } from '../parse/parser.js';
+import { ActionProvider } from '../utils/action-provider.js';
+import { getFiles } from '../utils/file-system.utils.js';
 class _OpenApiGenerator {
     constructor(config, providers, parser) {
         this._providers = providers;

package/esm/lib/codegen/index.js

@@ -1,6 +1,6 @@
-export * from './config';
-export * from './endpoints-generator';
-export * from './generator';
-export * from './schemas-generator';
-export * from './services-generator';
-export * from './types';
+export * from './config.js';
+export * from './endpoints-generator.js';
+export * from './generator.js';
+export * from './schemas-generator.js';
+export * from './services-generator.js';
+export * from './types.js';

package/esm/lib/codegen/schemas-generator.js

@@ -1,6 +1,6 @@
-import { OpenApiGenerationProviderBase } from './generator';
-import { addSourceIfTest } from './internal-utils';
-import { getSchemaReference } from '../utils';
+import { OpenApiGenerationProviderBase } from './generator.js';
+import { addSourceIfTest } from './internal-utils.js';
+import { getSchemaReference } from '../utils/index.js';
 export class OpenApiSchemasGenerationProviderBase extends OpenApiGenerationProviderBase {
     getProviderContext(context, config, defaultConfig) {
         const ctx = super.getProviderContext(context, config, defaultConfig);

package/esm/lib/codegen/services-generator.js

@@ -1,5 +1,5 @@
-import { OpenApiGenerationProviderBase } from './generator';
-import { addSourceIfTest } from './internal-utils';
+import { OpenApiGenerationProviderBase } from './generator.js';
+import { addSourceIfTest } from './internal-utils.js';
 export class OpenApiServicesGenerationProviderBase extends OpenApiGenerationProviderBase {
     getProviderContext(context, config, defaultConfig) {
         const ctx = super.getProviderContext(context, config, defaultConfig);

package/esm/lib/collect/collector.js

@@ -1,4 +1,4 @@
-import { collect, collectRecord } from './helpers';
+import { collect, collectRecord } from './helpers.js';
 export function collectOpenApi(apis) {
     const data = {
         documents: [],
@@ -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/collect/helpers.js

@@ -1,4 +1,4 @@
-import { isOpenApiObjectProperty } from '../internal-utils';
+import { isOpenApiObjectProperty } from '../internal-utils.js';
 export function collect(data, obj, func) {
     if (!obj)
         return;

package/esm/lib/collect/index.js

@@ -1,3 +1,3 @@
-export * from './collector';
-export * from './helpers';
-export * from './types';
+export * from './collector.js';
+export * from './helpers.js';
+export * from './types.js';

package/esm/lib/parse/deref-proxy.js

@@ -1,4 +1,4 @@
-import { isNullish } from '../utils';
+import { isNullish } from '../utils/index.js';
 export function createDerefProxy(obj, source, ref) {
     return new Proxy(obj, new DerefProxyHandler(source, ref));
 }

package/esm/lib/parse/index.js

@@ -1,3 +1,3 @@
-export * from './openapi-types';
-export * from './parser';
-export * from './types';
+export * from './openapi-types.js';
+export * from './parser.js';
+export * from './types.js';

package/esm/lib/parse/parser.js

@@ -4,11 +4,11 @@ import { cwd } from 'process';
 import fs from 'fs-extra';
 import nodeFetch from 'node-fetch';
 import YAML from 'yaml';
-import { createDerefProxy } from './deref-proxy';
-import { defaultOpenApiParserOptions } from './types';
-import { collectOpenApi } from '../collect/collector';
-import { transformOpenApi } from '../transform/transformer';
-import { isNullish } from '../utils';
+import { createDerefProxy } from './deref-proxy.js';
+import { defaultOpenApiParserOptions } from './types.js';
+import { collectOpenApi } from '../collect/collector.js';
+import { transformOpenApi } from '../transform/transformer.js';
+import { isNullish } from '../utils/index.js';
 export class OpenApiParser {
     constructor(config) {
         this._loadedDocuments = new Map();
@@ -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/parse/types.js

@@ -1,2 +1,2 @@
-import { defaultOpenApiTransformerOptions } from '../transform/types';
+import { defaultOpenApiTransformerOptions } from '../transform/types.js';
 export const defaultOpenApiParserOptions = { ...defaultOpenApiTransformerOptions };

package/esm/lib/transform/helpers.js

@@ -1,6 +1,7 @@
-import { isOpenApiObjectProperty } from '../internal-utils';
-import { getDeepProperty } from '../utils';
-import { isNullish } from '../utils/common.utils';
+import { parse as parsePath } from 'path';
+import { isOpenApiObjectProperty } from '../internal-utils.js';
+import { getDeepProperty } from '../utils/index.js';
+import { isNullish } from '../utils/common.utils.js';
 export function determineSchemaKind(ctx, schema) {
     if (schema.oneOf) {
         return 'oneOf';
@@ -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/esm/lib/transform/index.js

@@ -1,2 +1,2 @@
-export * from './api-types';
-export * from './transformer';
+export * from './api-types.js';
+export * from './transformer.js';

package/esm/lib/transform/transform-document.js

@@ -1,4 +1,4 @@
-import { getOpenApiObjectIdentifier } from './helpers';
+import { getOpenApiObjectIdentifier } from './helpers.js';
 export function transformDocument(context, document) {
     var _a;
     for (const tag of (_a = document.tags) !== null && _a !== void 0 ? _a : []) {

package/esm/lib/transform/transform-endpoint.js

@@ -1,6 +1,6 @@
-import { determineEndpointName, getCustomFields, getOpenApiObjectIdentifier } from './helpers';
-import { transformSchema } from './transform-schema';
-import { isOpenApiObjectProperty } from '../internal-utils';
+import { determineEndpointName, getCustomFields, getOpenApiObjectIdentifier } from './helpers.js';
+import { transformSchema } from './transform-schema.js';
+import { isOpenApiObjectProperty } from '../internal-utils.js';
 export function transformEndpoint(context, endpointInfo) {
     var _a, _b, _c, _d;
     const apiPath = transformApiPath(context, endpointInfo.path, endpointInfo.pathItem);

package/esm/lib/transform/transform-schema.js

@@ -1,5 +1,5 @@
-import { determineSchemaAccessibility, determineSchemaKind, determineSchemaName, getCustomFields, getOpenApiObjectIdentifier, transformAdditionalProperties, transformSchemaProperties, } from './helpers';
-import { createOverwriteProxy } from '../utils';
+import { determineSchemaAccessibility, determineSchemaKind, determineSchemaName, getCustomFields, getOpenApiObjectIdentifier, transformAdditionalProperties, transformSchemaProperties, } from './helpers.js';
+import { createOverwriteProxy } from '../utils/index.js';
 export function transformSchema(ctx, schema) {
     var _a, _b;
     if (!schema) {

package/esm/lib/transform/transformer.js

@@ -1,8 +1,8 @@
-import { IdGenerator } from './helpers';
-import { transformDocument } from './transform-document';
-import { transformEndpoint } from './transform-endpoint';
-import { transformSchema } from './transform-schema';
-import { defaultOpenApiTransformerOptions } from './types';
+import { IdGenerator } from './helpers.js';
+import { transformDocument } from './transform-document.js';
+import { transformEndpoint } from './transform-endpoint.js';
+import { transformSchema } from './transform-schema.js';
+import { defaultOpenApiTransformerOptions } from './types.js';
 export function transformOpenApi(data, options) {
     const context = {
         config: { ...defaultOpenApiTransformerOptions, ...options },

package/esm/lib/utils/index.js

@@ -1,14 +1,14 @@
-export * from './array.utils';
-export * from './class.utils';
-export * from './common.utils';
-export * from './endpoint.utils';
-export * from './error.utils';
-export * from './factory';
-export * from './generator.utils';
-export * from './object.utils';
-export * from './schema.utils';
-export * from './source-builder';
-export * from './string-builder';
-export * from './string.utils';
-export * from './string.utils.types';
-export * from './type.utils';
+export * from './array.utils.js';
+export * from './class.utils.js';
+export * from './common.utils.js';
+export * from './endpoint.utils.js';
+export * from './error.utils.js';
+export * from './factory.js';
+export * from './generator.utils.js';
+export * from './object.utils.js';
+export * from './schema.utils.js';
+export * from './source-builder.js';
+export * from './string-builder/index.js';
+export * from './string.utils.js';
+export * from './string.utils.types.js';
+export * from './type.utils.js';

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

@@ -1,4 +1,4 @@
-import { isOpenApiObjectProperty } from '../internal-utils';
+import { isOpenApiObjectProperty } from '../internal-utils.js';
 export function resolveAnyOfAndAllOf(schema, ignoreNonObjectParts) {
     if (!ignoreNonObjectParts && (hasInvalidSubSchema(schema.anyOf) || hasInvalidSubSchema(schema.allOf))) {
         return undefined;

package/esm/lib/utils/source-builder.js

@@ -1,7 +1,7 @@
-import { isNullish } from './common.utils';
-import { evalCondition } from './condition';
-import { defaultStringBuilderOptions, StringBuilder, } from './string-builder';
-import { removeStr, trimEnd } from './string.utils';
+import { isNullish } from './common.utils.js';
+import { evalCondition } from './condition.js';
+import { defaultStringBuilderOptions, StringBuilder, } from './string-builder/index.js';
+import { removeStr, trimEnd } from './string.utils.js';
 /**
  * Default options for the `SourceBuilder` class.
  */

package/esm/lib/utils/string-builder/index.js

@@ -1,3 +1,3 @@
-export * from './options';
-export { StringBuilder } from './string-builder';
-export * from './utils';
+export * from './options.js';
+export { StringBuilder } from './string-builder.js';
+export * from './utils.js';

package/esm/lib/utils/string-builder/string-builder.js

@@ -1,5 +1,5 @@
-import { defaultStringBuilderOptions } from './options';
-import { isNullish } from '../common.utils';
+import { defaultStringBuilderOptions } from './options.js';
+import { isNullish } from '../common.utils.js';
 export const AdditionalAppendsSymbol = Symbol('AdditionalAppends');
 /**
  * Represents a mutable string of characters.

package/esm/lib/utils/string-builder/utils.js

@@ -1,4 +1,4 @@
-import { concatSingleOrMultiple, notNullish } from '../common.utils';
+import { concatSingleOrMultiple, notNullish } from '../common.utils.js';
 export function basicAppendValueGroup(values, separator) {
     var _a;
     return {

package/esm/lib/utils/string.utils.js

@@ -1,4 +1,4 @@
-import { isNullish } from './common.utils';
+import { isNullish } from './common.utils.js';
 export function adjustCasing(a, b) {
     if (typeof a === 'string') {
         if (typeof b === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/core",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "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/api-types.d.ts

@@ -174,7 +174,7 @@ export type CombinedLikeApiSchema = ApiSchemaBase & {
 export type NumberLikeApiSchema = ApiSchemaBase & {
     kind: 'number' | 'integer' | 'multi-type';
     type: 'number' | 'integer' | string[];
-} & AdditionalNumberSchemaProperties;
+} & AdditionalNumberSchemaProperties & AdditionalPrimitiveSchemaProperties;
 export type ArrayLikeApiSchema = ApiSchemaBase & {
     kind: 'array' | 'multi-type';
     type: 'array' | string[];
@@ -186,7 +186,7 @@ export type ObjectLikeApiSchema = ApiSchemaBase & {
 export type StringLikeApiSchema = ApiSchemaBase & {
     kind: 'string' | 'multi-type';
     type: 'string' | string[];
-} & AdditionalStringSchemaProperties;
+} & AdditionalStringSchemaProperties & AdditionalPrimitiveSchemaProperties;
 export type PrimitiveLikeApiSchema = ApiSchemaBase & {
     kind: 'string' | 'number' | 'integer' | 'boolean' | 'null' | 'multi-type';
     type: 'string' | 'number' | 'integer' | 'boolean' | 'null' | string[];

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;