@goast/core 0.3.3 → 0.3.4

package/cjs/lib/transform/helpers.js

@@ -18,7 +18,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';

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/transform/helpers.js

@@ -6,7 +6,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';

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.4",
   "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

@@ -7,6 +7,7 @@ export declare function determineSchemaKind<T extends {
     anyOf?: unknown;
     type?: string | string[];
     properties?: Record<string, unknown>;
+    additionalProperties?: unknown;
 }>(ctx: OpenApiTransformerContext, schema: T): ApiSchemaKind;
 export declare function determineSchemaName(schema: {
     title?: string;