@skmtc/core 0.0.445 → 0.0.447

package/esm/oas/components/toComponentsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toComponentsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/components/toComponentsV3.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,aAAa,GAAG,SAgCvC,CAAA"}
+{"version":3,"file":"toComponentsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/components/toComponentsV3.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,aAAa,GAAG,SAkCvC,CAAA"}

package/esm/oas/components/toComponentsV3.js

@@ -13,7 +13,7 @@ export const toComponentsV3 = ({ components, context }) => {
     const { schemas, responses, parameters, examples, requestBodies, headers, ...skipped } = components;
     const extensionFields = toSpecificationExtensionsV3({ skipped, context });
     const fields = {
-        schemas: context.trace('schemas', () => toOptionalSchemasV3({ schemas, context })),
+        schemas: context.trace('schemas', () => toOptionalSchemasV3({ schemas, context, childOfComponents: true })),
         responses: context.trace('responses', () => toOptionalResponsesV3({ responses, context })),
         parameters: context.trace('parameters', () => toOptionalParametersV3({
             parameters,

package/esm/oas/object/toObject.d.ts

@@ -4,7 +4,8 @@ import { OasObject } from './Object.js';
 type ToObjectArgs = {
     value: OpenAPIV3.NonArraySchemaObject;
     context: ParseContext;
+    childOfComponents?: boolean;
 };
-export declare const toObject: ({ value, context }: ToObjectArgs) => OasObject;
+export declare const toObject: ({ value, context, childOfComponents }: ToObjectArgs) => OasObject;
 export {};
 //# sourceMappingURL=toObject.d.ts.map

package/esm/oas/object/toObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toObject.d.ts","sourceRoot":"","sources":["../../../src/oas/object/toObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAwB,MAAM,aAAa,CAAA;AAK7D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAA;IACrC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,QAAQ,uBAAwB,YAAY,KAAG,SA+C3D,CAAA"}
+{"version":3,"file":"toObject.d.ts","sourceRoot":"","sources":["../../../src/oas/object/toObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAwB,MAAM,aAAa,CAAA;AAK7D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAA;IACrC,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,QAAQ,0CAA2C,YAAY,KAAG,SAsC9E,CAAA"}

package/esm/oas/object/toObject.js

@@ -2,20 +2,12 @@ import { OasObject } from './Object.js';
 import { toOptionalSchemasV3 } from '../schema/toSchemasV3.js';
 import { toAdditionalPropertiesV3 } from './toAdditionalPropertiesV3.js';
 import { toSpecificationExtensionsV3 } from '../specificationExtensions/toSpecificationExtensionsV3.js';
-export const toObject = ({ value, context }) => {
+export const toObject = ({ value, context, childOfComponents }) => {
     const { type: _type, title, description, properties, required, additionalProperties, nullable, example, ...skipped } = value;
     const extensionFields = toSpecificationExtensionsV3({
         skipped,
         context
     });
-    if (extensionFields && Object.keys(extensionFields).length > 0) {
-        const last = context.stackTrail.stackTrail.slice(-1);
-        context.registerExtension({
-            extensionFields,
-            type: 'model',
-            stackTrail: ['models', last.toString()]
-        });
-    }
     const fields = {
         title,
         description,
@@ -23,7 +15,8 @@ export const toObject = ({ value, context }) => {
         example,
         properties: context.trace('properties', () => toOptionalSchemasV3({
             schemas: properties,
-            context
+            context,
+            childOfObject: childOfComponents
         })),
         required: required,
         additionalProperties: context.trace('additionalProperties', () => toAdditionalPropertiesV3({ additionalProperties, context })),

package/esm/oas/schema/toSchemasV3.d.ts

@@ -5,18 +5,23 @@ import type { OasRef } from '../ref/Ref.js';
 type ToSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;
     context: ParseContext;
+    childOfComponents?: boolean;
+    childOfObject?: boolean;
 };
-export declare const toSchemasV3: ({ schemas, context }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
+export declare const toSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
 type ToOptionalSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject> | undefined;
     context: ParseContext;
+    childOfComponents?: boolean;
+    childOfObject?: boolean;
 };
-export declare const toOptionalSchemasV3: ({ schemas, context }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
+export declare const toOptionalSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
 type ToSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
     context: ParseContext;
+    childOfComponents?: boolean;
 };
-export declare const toSchemaV3: ({ schema, context }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
+export declare const toSchemaV3: ({ schema, context, childOfComponents }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
 type ToOptionalSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined;
     context: ParseContext;

package/esm/oas/schema/toSchemasV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAW3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW,yBAGrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAM/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,mBAAmB,yBAG7B,uBAAuB,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAM3E,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,UAAU,wBAAyB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAuC3F,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}
+{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAY3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,WAAW,2DAKrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAyB/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,mBAAmB,2DAK7B,uBAAuB,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAM3E,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,UAAU,2CAIpB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAuC9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}

package/esm/oas/schema/toSchemasV3.js

@@ -10,18 +10,34 @@ import { toString } from '../string/toString.js';
 import { toUnknown } from '../unknown/toUnknown.js';
 import { toUnion } from '../union/toUnion.js';
 import { toIntersection } from '../intersection/toIntersection.js';
-export const toSchemasV3 = ({ schemas, context }) => {
+import { extractExtensions } from '../specificationExtensions/toSpecificationExtensionsV3.js';
+export const toSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
     return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
-        return [key, context.trace(key, () => toSchemaV3({ schema, context }))];
+        return [
+            key,
+            context.trace(key, () => {
+                if ((childOfComponents || childOfObject) && !isRef(schema)) {
+                    const { extensionFields } = extractExtensions(schema);
+                    const parent = context.stackTrail.stackTrail.slice(-2, -1).at(0);
+                    const stackTrail = childOfComponents ? ['models', key] : ['models', String(parent), key];
+                    context.registerExtension({
+                        extensionFields: extensionFields ?? {},
+                        stackTrail,
+                        type: 'schema'
+                    });
+                }
+                return toSchemaV3({ schema, context });
+            })
+        ];
     }));
 };
-export const toOptionalSchemasV3 = ({ schemas, context }) => {
+export const toOptionalSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
     if (!schemas) {
         return undefined;
     }
-    return toSchemasV3({ schemas, context });
+    return toSchemasV3({ schemas, context, childOfComponents, childOfObject });
 };
-export const toSchemaV3 = ({ schema, context }) => {
+export const toSchemaV3 = ({ schema, context, childOfComponents }) => {
     if (isRef(schema)) {
         return toRefV31({ ref: schema, refType: 'schema', context });
     }
@@ -48,7 +64,7 @@ export const toSchemaV3 = ({ schema, context }) => {
         // }
         return context.trace('allOf', () => toIntersection({ value, members, context }));
     })
-        .with({ type: 'object' }, value => toObject({ value, context }))
+        .with({ type: 'object' }, value => toObject({ value, context, childOfComponents }))
         .with({ type: 'array' }, value => toArray({ value, context }))
         .with({ type: 'integer' }, value => toInteger({ value, context }))
         .with({ type: 'number' }, value => toNumber({ value, context }))

package/esm/oas/specificationExtensions/toSpecificationExtensionsV3.d.ts

@@ -4,5 +4,9 @@ type ToSpecificationExtensionsV3Args = {
     context: ParseContext;
 };
 export declare const toSpecificationExtensionsV3: ({ skipped: s, context }: ToSpecificationExtensionsV3Args) => Record<string, unknown> | undefined;
+export declare const extractExtensions: (item: Record<string, unknown>) => {
+    skipped: Record<string, unknown>;
+    extensionFields: Record<string, unknown> | undefined;
+};
 export {};
 //# sourceMappingURL=toSpecificationExtensionsV3.d.ts.map

package/esm/oas/specificationExtensions/toSpecificationExtensionsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSpecificationExtensionsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/specificationExtensions/toSpecificationExtensionsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,2BAA2B,4BAGrC,+BAA+B,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SA4B9D,CAAA"}
+{"version":3,"file":"toSpecificationExtensionsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/specificationExtensions/toSpecificationExtensionsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,2BAA2B,4BAGrC,+BAA+B,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAM9D,CAAA;AAED,eAAO,MAAM,iBAAiB,SAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;aAElD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;qBACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;CAqBvD,CAAA"}

package/esm/oas/specificationExtensions/toSpecificationExtensionsV3.js

@@ -1,5 +1,10 @@
 export const toSpecificationExtensionsV3 = ({ skipped: s, context }) => {
-    const { skipped, extensionFields } = Object.entries(s).reduce((acc, [key, value]) => {
+    const { skipped, extensionFields } = extractExtensions(s);
+    context.logSkippedFields(skipped);
+    return extensionFields;
+};
+export const extractExtensions = (item) => {
+    return Object.entries(item).reduce((acc, [key, value]) => {
         if (!key.startsWith('x-')) {
             return acc;
         }
@@ -12,7 +17,5 @@ export const toSpecificationExtensionsV3 = ({ skipped: s, context }) => {
                 [key]: value
             }
         };
-    }, { skipped: s, extensionFields: undefined });
-    context.logSkippedFields(skipped);
-    return extensionFields;
+    }, { skipped: item, extensionFields: undefined });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.0.445",
+  "version": "0.0.447",
   "main": "./script/mod.js",
   "module": "./esm/mod.js",
   "exports": {

package/script/oas/components/toComponentsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toComponentsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/components/toComponentsV3.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,aAAa,GAAG,SAgCvC,CAAA"}
+{"version":3,"file":"toComponentsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/components/toComponentsV3.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAI/C,KAAK,kBAAkB,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,gBAAgB,GAAG,SAAS,CAAA;IAClD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,4BAGxB,kBAAkB,KAAG,aAAa,GAAG,SAkCvC,CAAA"}

package/script/oas/components/toComponentsV3.js

@@ -16,7 +16,7 @@ const toComponentsV3 = ({ components, context }) => {
     const { schemas, responses, parameters, examples, requestBodies, headers, ...skipped } = components;
     const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({ skipped, context });
     const fields = {
-        schemas: context.trace('schemas', () => (0, toSchemasV3_js_1.toOptionalSchemasV3)({ schemas, context })),
+        schemas: context.trace('schemas', () => (0, toSchemasV3_js_1.toOptionalSchemasV3)({ schemas, context, childOfComponents: true })),
         responses: context.trace('responses', () => (0, toResponseV3_js_1.toOptionalResponsesV3)({ responses, context })),
         parameters: context.trace('parameters', () => (0, toParameterV3_js_1.toOptionalParametersV3)({
             parameters,

package/script/oas/object/toObject.d.ts

@@ -4,7 +4,8 @@ import { OasObject } from './Object.js';
 type ToObjectArgs = {
     value: OpenAPIV3.NonArraySchemaObject;
     context: ParseContext;
+    childOfComponents?: boolean;
 };
-export declare const toObject: ({ value, context }: ToObjectArgs) => OasObject;
+export declare const toObject: ({ value, context, childOfComponents }: ToObjectArgs) => OasObject;
 export {};
 //# sourceMappingURL=toObject.d.ts.map

package/script/oas/object/toObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toObject.d.ts","sourceRoot":"","sources":["../../../src/oas/object/toObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAwB,MAAM,aAAa,CAAA;AAK7D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAA;IACrC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,QAAQ,uBAAwB,YAAY,KAAG,SA+C3D,CAAA"}
+{"version":3,"file":"toObject.d.ts","sourceRoot":"","sources":["../../../src/oas/object/toObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAwB,MAAM,aAAa,CAAA;AAK7D,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,SAAS,CAAC,oBAAoB,CAAA;IACrC,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,QAAQ,0CAA2C,YAAY,KAAG,SAsC9E,CAAA"}

package/script/oas/object/toObject.js

@@ -5,20 +5,12 @@ const Object_js_1 = require("./Object.js");
 const toSchemasV3_js_1 = require("../schema/toSchemasV3.js");
 const toAdditionalPropertiesV3_js_1 = require("./toAdditionalPropertiesV3.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
-const toObject = ({ value, context }) => {
+const toObject = ({ value, context, childOfComponents }) => {
     const { type: _type, title, description, properties, required, additionalProperties, nullable, example, ...skipped } = value;
     const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({
         skipped,
         context
     });
-    if (extensionFields && Object.keys(extensionFields).length > 0) {
-        const last = context.stackTrail.stackTrail.slice(-1);
-        context.registerExtension({
-            extensionFields,
-            type: 'model',
-            stackTrail: ['models', last.toString()]
-        });
-    }
     const fields = {
         title,
         description,
@@ -26,7 +18,8 @@ const toObject = ({ value, context }) => {
         example,
         properties: context.trace('properties', () => (0, toSchemasV3_js_1.toOptionalSchemasV3)({
             schemas: properties,
-            context
+            context,
+            childOfObject: childOfComponents
         })),
         required: required,
         additionalProperties: context.trace('additionalProperties', () => (0, toAdditionalPropertiesV3_js_1.toAdditionalPropertiesV3)({ additionalProperties, context })),

package/script/oas/schema/toSchemasV3.d.ts

@@ -5,18 +5,23 @@ import type { OasRef } from '../ref/Ref.js';
 type ToSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;
     context: ParseContext;
+    childOfComponents?: boolean;
+    childOfObject?: boolean;
 };
-export declare const toSchemasV3: ({ schemas, context }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
+export declare const toSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
 type ToOptionalSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject> | undefined;
     context: ParseContext;
+    childOfComponents?: boolean;
+    childOfObject?: boolean;
 };
-export declare const toOptionalSchemasV3: ({ schemas, context }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
+export declare const toOptionalSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
 type ToSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
     context: ParseContext;
+    childOfComponents?: boolean;
 };
-export declare const toSchemaV3: ({ schema, context }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
+export declare const toSchemaV3: ({ schema, context, childOfComponents }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
 type ToOptionalSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject | undefined;
     context: ParseContext;

package/script/oas/schema/toSchemasV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAW3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW,yBAGrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAM/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,mBAAmB,yBAG7B,uBAAuB,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAM3E,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,UAAU,wBAAyB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAuC3F,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}
+{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAY3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,WAAW,2DAKrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAyB/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,mBAAmB,2DAK7B,uBAAuB,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAM3E,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,UAAU,2CAIpB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAuC9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}

package/script/oas/schema/toSchemasV3.js

@@ -13,20 +13,36 @@ const toString_js_1 = require("../string/toString.js");
 const toUnknown_js_1 = require("../unknown/toUnknown.js");
 const toUnion_js_1 = require("../union/toUnion.js");
 const toIntersection_js_1 = require("../intersection/toIntersection.js");
-const toSchemasV3 = ({ schemas, context }) => {
+const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
+const toSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
     return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
-        return [key, context.trace(key, () => (0, exports.toSchemaV3)({ schema, context }))];
+        return [
+            key,
+            context.trace(key, () => {
+                if ((childOfComponents || childOfObject) && !(0, refFns_js_1.isRef)(schema)) {
+                    const { extensionFields } = (0, toSpecificationExtensionsV3_js_1.extractExtensions)(schema);
+                    const parent = context.stackTrail.stackTrail.slice(-2, -1).at(0);
+                    const stackTrail = childOfComponents ? ['models', key] : ['models', String(parent), key];
+                    context.registerExtension({
+                        extensionFields: extensionFields ?? {},
+                        stackTrail,
+                        type: 'schema'
+                    });
+                }
+                return (0, exports.toSchemaV3)({ schema, context });
+            })
+        ];
     }));
 };
 exports.toSchemasV3 = toSchemasV3;
-const toOptionalSchemasV3 = ({ schemas, context }) => {
+const toOptionalSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
     if (!schemas) {
         return undefined;
     }
-    return (0, exports.toSchemasV3)({ schemas, context });
+    return (0, exports.toSchemasV3)({ schemas, context, childOfComponents, childOfObject });
 };
 exports.toOptionalSchemasV3 = toOptionalSchemasV3;
-const toSchemaV3 = ({ schema, context }) => {
+const toSchemaV3 = ({ schema, context, childOfComponents }) => {
     if ((0, refFns_js_1.isRef)(schema)) {
         return (0, toRefV31_js_1.toRefV31)({ ref: schema, refType: 'schema', context });
     }
@@ -53,7 +69,7 @@ const toSchemaV3 = ({ schema, context }) => {
         // }
         return context.trace('allOf', () => (0, toIntersection_js_1.toIntersection)({ value, members, context }));
     })
-        .with({ type: 'object' }, value => (0, toObject_js_1.toObject)({ value, context }))
+        .with({ type: 'object' }, value => (0, toObject_js_1.toObject)({ value, context, childOfComponents }))
         .with({ type: 'array' }, value => (0, toArray_js_1.toArray)({ value, context }))
         .with({ type: 'integer' }, value => (0, toInteger_js_1.toInteger)({ value, context }))
         .with({ type: 'number' }, value => (0, toNumber_js_1.toNumber)({ value, context }))

package/script/oas/specificationExtensions/toSpecificationExtensionsV3.d.ts

@@ -4,5 +4,9 @@ type ToSpecificationExtensionsV3Args = {
     context: ParseContext;
 };
 export declare const toSpecificationExtensionsV3: ({ skipped: s, context }: ToSpecificationExtensionsV3Args) => Record<string, unknown> | undefined;
+export declare const extractExtensions: (item: Record<string, unknown>) => {
+    skipped: Record<string, unknown>;
+    extensionFields: Record<string, unknown> | undefined;
+};
 export {};
 //# sourceMappingURL=toSpecificationExtensionsV3.d.ts.map

package/script/oas/specificationExtensions/toSpecificationExtensionsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSpecificationExtensionsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/specificationExtensions/toSpecificationExtensionsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,2BAA2B,4BAGrC,+BAA+B,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SA4B9D,CAAA"}
+{"version":3,"file":"toSpecificationExtensionsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/specificationExtensions/toSpecificationExtensionsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,KAAK,+BAA+B,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,2BAA2B,4BAGrC,+BAA+B,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAM9D,CAAA;AAED,eAAO,MAAM,iBAAiB,SAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;aAElD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;qBACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;CAqBvD,CAAA"}

package/script/oas/specificationExtensions/toSpecificationExtensionsV3.js

@@ -1,8 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toSpecificationExtensionsV3 = void 0;
+exports.extractExtensions = exports.toSpecificationExtensionsV3 = void 0;
 const toSpecificationExtensionsV3 = ({ skipped: s, context }) => {
-    const { skipped, extensionFields } = Object.entries(s).reduce((acc, [key, value]) => {
+    const { skipped, extensionFields } = (0, exports.extractExtensions)(s);
+    context.logSkippedFields(skipped);
+    return extensionFields;
+};
+exports.toSpecificationExtensionsV3 = toSpecificationExtensionsV3;
+const extractExtensions = (item) => {
+    return Object.entries(item).reduce((acc, [key, value]) => {
         if (!key.startsWith('x-')) {
             return acc;
         }
@@ -15,8 +21,6 @@ const toSpecificationExtensionsV3 = ({ skipped: s, context }) => {
                 [key]: value
             }
         };
-    }, { skipped: s, extensionFields: undefined });
-    context.logSkippedFields(skipped);
-    return extensionFields;
+    }, { skipped: item, extensionFields: undefined });
 };
-exports.toSpecificationExtensionsV3 = toSpecificationExtensionsV3;
+exports.extractExtensions = extractExtensions;