refactor: clean up folder structure

Author: mrlubos

…ges/spec-types/src/extensions/openapi.ts …pec-types/src/extensions/code-samples.tspackages/spec-types/src/extensions/openapi.ts renamed to packages/spec-types/src/extensions/code-samples.ts packages/spec-types/src/extensions/openapi.ts renamed to packages/spec-types/src/extensions/code-samples.ts

@@ -41,27 +41,3 @@ export interface CodeSampleObject {
    */
   source: string;
 }
-
-export interface EnumExtensions {
-  /**
-   * `x-enum-descriptions` are {@link https://stackoverflow.com/a/66471626 supported} by OpenAPI Generator.
-   */
-  'x-enum-descriptions'?: Array<string>;
-  /**
-   * `x-enum-varnames` are {@link https://stackoverflow.com/a/66471626 supported} by OpenAPI Generator.
-   */
-  'x-enum-varnames'?: Array<string>;
-  /**
-   * {@link https://github.com/RicoSuter/NSwag NSwag} generates `x-enumNames` field containing custom enum names.
-   */
-  'x-enumNames'?: Array<string>;
-}
-
-/**
- * OpenAPI Specification Extensions.
- *
- * See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
- */
-export interface OpenAPIExtensions {
-  [extension: `x-${string}`]: unknown;
-}

packages/spec-types/src/extensions/enum.ts

@@ -0,0 +1,14 @@
+export interface EnumExtensions {
+  /**
+   * `x-enum-descriptions` are {@link https://stackoverflow.com/a/66471626 supported} by OpenAPI Generator.
+   */
+  'x-enum-descriptions'?: Array<string>;
+  /**
+   * `x-enum-varnames` are {@link https://stackoverflow.com/a/66471626 supported} by OpenAPI Generator.
+   */
+  'x-enum-varnames'?: Array<string>;
+  /**
+   * {@link https://github.com/RicoSuter/NSwag NSwag} generates `x-enumNames` field containing custom enum names.
+   */
+  'x-enumNames'?: Array<string>;
+}

packages/spec-types/src/extensions/spec.ts

@@ -0,0 +1,8 @@
+/**
+ * Specification Extensions.
+ *
+ * See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#specification-extensions Specification Extensions}.
+ */
+export interface SpecExtensions {
+  [extension: `x-${string}`]: unknown;
+}

packages/spec-types/src/index.ts

@@ -1,9 +1,6 @@
-export type {
-  CodeSampleObject,
-  EnumExtensions,
-  LinguistLanguages,
-  OpenAPIExtensions,
-} from './extensions/openapi';
+export type { CodeSampleObject, LinguistLanguages } from './extensions/code-samples';
+export type { EnumExtensions } from './extensions/enum';
+export type { SpecExtensions } from './extensions/spec';
 export type * as JSONSchemaDraft4 from './json-schema/draft-4';
 export type * as JSONSchemaDraft2020_12 from './json-schema/draft-2020-12';
 export * as JSONSchema from './json-schema/union';

packages/spec-types/src/json-schema/draft-2020-12/spec.ts

@@ -1,18 +1,7 @@
 import type { AnyString, MaybeArray } from '@hey-api/types';
 
-import type { EnumExtensions, OpenAPIExtensions } from '../../extensions/openapi';
-import type { OpenAPIV3_1SchemaExtensions } from '../../openapi/v3-1/extensions';
-
 // TODO: left out some keywords related to structuring a complex schema and declaring a dialect
-export interface Document
-  extends
-    ArrayKeywords,
-    NumberKeywords,
-    ObjectKeywords,
-    StringKeywords,
-    EnumExtensions,
-    OpenAPIV3_1SchemaExtensions,
-    OpenAPIExtensions {
+export interface Document extends ArrayKeywords, NumberKeywords, ObjectKeywords, StringKeywords {
   /**
    * The `$comment` {@link https://json-schema.org/learn/glossary#keyword keyword} is strictly intended for adding comments to a schema. Its value must always be a string. Unlike the annotations `title`, `description`, and `examples`, JSON schema {@link https://json-schema.org/learn/glossary#implementation implementations} aren't allowed to attach any meaning or behavior to it whatsoever, and may even strip them at any time. Therefore, they are useful for leaving notes to future editors of a JSON schema, but should not be used to communicate to users of the schema.
    */

packages/spec-types/src/json-schema/draft-4/spec.ts

@@ -1,8 +1,6 @@
 import type { AnyString } from '@hey-api/types';
 
-import type { EnumExtensions } from '../../extensions/openapi';
-
-export interface Document extends EnumExtensions {
+export interface Document {
   /**
    * A schema can reference another schema using the `$ref` keyword. The value of `$ref` is a URI-reference that is resolved against the schema's {@link https://json-schema.org/understanding-json-schema/structuring#base-uri Base URI}. When evaluating a `$ref`, an implementation uses the resolved identifier to retrieve the referenced schema and applies that schema to the {@link https://json-schema.org/learn/glossary#instance instance}.
    *

packages/spec-types/src/openapi/v2/spec.ts

@@ -1,4 +1,5 @@
-import type { CodeSampleObject, EnumExtensions } from '../../extensions/openapi';
+import type { CodeSampleObject } from '../../extensions/code-samples';
+import type { EnumExtensions } from '../../extensions/enum';
 import type { Document as JSONSchemaDraft4 } from '../../json-schema/draft-4/spec';
 import type { OpenAPIV2NullableExtensions } from './extensions';
 
@@ -1306,7 +1307,8 @@ export interface ResponsesObject {
  *       - packSize
  * ```
  */
-export interface SchemaObject extends JSONSchemaDraft4, OpenAPIV2NullableExtensions {
+export interface SchemaObject
+  extends JSONSchemaDraft4, EnumExtensions, OpenAPIV2NullableExtensions {
   /**
    * Allows extensions to the Swagger Schema. The field name MUST begin with `x-`, for example, `x-internal-id`. The value can be `null`, a primitive, an array or an object. See {@link https://github.com/OAI/OpenAPI-Specification/blob/main/versions/2.0.md#specification-extensions Vendor Extensions} for further details.
    */