@skmtc/core 0.0.447 → 0.0.449

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

@@ -4,8 +4,7 @@ import { OasObject } from './Object.js';
 type ToObjectArgs = {
     value: OpenAPIV3.NonArraySchemaObject;
     context: ParseContext;
-    childOfComponents?: boolean;
 };
-export declare const toObject: ({ value, context, childOfComponents }: ToObjectArgs) => OasObject;
+export declare const toObject: ({ value, context }: 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;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,QAAQ,0CAA2C,YAAY,KAAG,SAsC9E,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;CACtB,CAAA;AAED,eAAO,MAAM,QAAQ,uBAAwB,YAAY,KAAG,SAqC3D,CAAA"}

package/esm/oas/object/toObject.js

@@ -2,7 +2,7 @@ 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, childOfComponents }) => {
+export const toObject = ({ value, context }) => {
     const { type: _type, title, description, properties, required, additionalProperties, nullable, example, ...skipped } = value;
     const extensionFields = toSpecificationExtensionsV3({
         skipped,
@@ -15,8 +15,7 @@ export const toObject = ({ value, context, childOfComponents }) => {
         example,
         properties: context.trace('properties', () => toOptionalSchemasV3({
             schemas: properties,
-            context,
-            childOfObject: childOfComponents
+            context
         })),
         required: required,
         additionalProperties: context.trace('additionalProperties', () => toAdditionalPropertiesV3({ additionalProperties, context })),

package/esm/oas/operation/toOperationsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toOperationsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/toOperationsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAIjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAI1D,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAOD,eAAO,MAAM,aAAa,0CAIvB,iBAAiB,KAAG,YAuCtB,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,uBAAwB,kBAAkB,KAAG,YAAY,EAsDnF,CAAA"}
+{"version":3,"file":"toOperationsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/toOperationsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAIjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAI1D,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAOD,eAAO,MAAM,aAAa,0CAIvB,iBAAiB,KAAG,YAwCtB,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,uBAAwB,kBAAkB,KAAG,YAAY,EAsDnF,CAAA"}

package/esm/oas/operation/toOperationsV3.js

@@ -9,13 +9,14 @@ export const toOperationV3 = ({ operation, operationInfo, context }) => {
     const { method, path, pathItem } = operationInfo;
     const { operationId, tags, summary, description, parameters, requestBody, responses, deprecated, ...skipped } = operation;
     const extensionFields = toSpecificationExtensionsV3({ skipped, context });
-    if (extensionFields && Object.keys(extensionFields).length > 0) {
-        context.registerExtension({
-            extensionFields,
-            type: 'operation',
-            stackTrail: ['operations', path, method]
-        });
-    }
+    context.registerExtension({
+        extensionFields: {
+            Label: extensionFields?.['x-label'] ?? '',
+            Description: extensionFields?.['x-description'] ?? ''
+        },
+        type: 'operation',
+        stackTrail: ['operations', `${method.toUpperCase()} ${path}`]
+    });
     return new OasOperation({
         pathItem,
         path,

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

@@ -6,22 +6,19 @@ type ToSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;
     context: ParseContext;
     childOfComponents?: boolean;
-    childOfObject?: boolean;
 };
-export declare const toSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
+export declare const toSchemasV3: ({ schemas, context, childOfComponents }: 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, childOfComponents, childOfObject }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
+export declare const toOptionalSchemasV3: ({ schemas, context, childOfComponents }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
 type ToSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
     context: ParseContext;
-    childOfComponents?: boolean;
 };
-export declare const toSchemaV3: ({ schema, context, childOfComponents }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
+export declare const toSchemaV3: ({ schema, context }: 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;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"}
+{"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;CAC5B,CAAA;AAED,eAAO,MAAM,WAAW,4CAIrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAoC/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;CAC5B,CAAA;AAED,eAAO,MAAM,mBAAmB,4CAI7B,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"}

package/esm/oas/schema/toSchemasV3.js

@@ -11,33 +11,46 @@ import { toUnknown } from '../unknown/toUnknown.js';
 import { toUnion } from '../union/toUnion.js';
 import { toIntersection } from '../intersection/toIntersection.js';
 import { extractExtensions } from '../specificationExtensions/toSpecificationExtensionsV3.js';
-export const toSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
+export const toSchemasV3 = ({ schemas, context, childOfComponents }) => {
     return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
         return [
             key,
             context.trace(key, () => {
-                if ((childOfComponents || childOfObject) && !isRef(schema)) {
+                if (!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'
-                    });
+                    if (childOfComponents) {
+                        context.registerExtension({
+                            extensionFields: {
+                                Label: extensionFields?.['x-label'] ?? '',
+                                Description: extensionFields?.['x-description'] ?? ''
+                            },
+                            stackTrail: ['models', key],
+                            type: 'schema'
+                        });
+                    }
+                    else {
+                        console.log('STACK TRAIL X', context.stackTrail.clone().toString());
+                        context.registerExtension({
+                            extensionFields: {
+                                Label: extensionFields?.['x-label'] ?? ''
+                            },
+                            stackTrail: ['models', 'XXX', key],
+                            type: 'schema'
+                        });
+                    }
                 }
                 return toSchemaV3({ schema, context });
             })
         ];
     }));
 };
-export const toOptionalSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
+export const toOptionalSchemasV3 = ({ schemas, context, childOfComponents }) => {
     if (!schemas) {
         return undefined;
     }
-    return toSchemasV3({ schemas, context, childOfComponents, childOfObject });
+    return toSchemasV3({ schemas, context, childOfComponents });
 };
-export const toSchemaV3 = ({ schema, context, childOfComponents }) => {
+export const toSchemaV3 = ({ schema, context }) => {
     if (isRef(schema)) {
         return toRefV31({ ref: schema, refType: 'schema', context });
     }
@@ -64,7 +77,7 @@ export const toSchemaV3 = ({ schema, context, childOfComponents }) => {
         // }
         return context.trace('allOf', () => toIntersection({ value, members, context }));
     })
-        .with({ type: 'object' }, value => toObject({ value, context, childOfComponents }))
+        .with({ type: 'object' }, value => toObject({ value, context }))
         .with({ type: 'array' }, value => toArray({ value, context }))
         .with({ type: 'integer' }, value => toInteger({ value, context }))
         .with({ type: 'number' }, value => toNumber({ value, context }))

package/package.json

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

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

@@ -4,8 +4,7 @@ import { OasObject } from './Object.js';
 type ToObjectArgs = {
     value: OpenAPIV3.NonArraySchemaObject;
     context: ParseContext;
-    childOfComponents?: boolean;
 };
-export declare const toObject: ({ value, context, childOfComponents }: ToObjectArgs) => OasObject;
+export declare const toObject: ({ value, context }: 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;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,QAAQ,0CAA2C,YAAY,KAAG,SAsC9E,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;CACtB,CAAA;AAED,eAAO,MAAM,QAAQ,uBAAwB,YAAY,KAAG,SAqC3D,CAAA"}

package/script/oas/object/toObject.js

@@ -5,7 +5,7 @@ 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, childOfComponents }) => {
+const toObject = ({ value, context }) => {
     const { type: _type, title, description, properties, required, additionalProperties, nullable, example, ...skipped } = value;
     const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({
         skipped,
@@ -18,8 +18,7 @@ const toObject = ({ value, context, childOfComponents }) => {
         example,
         properties: context.trace('properties', () => (0, toSchemasV3_js_1.toOptionalSchemasV3)({
             schemas: properties,
-            context,
-            childOfObject: childOfComponents
+            context
         })),
         required: required,
         additionalProperties: context.trace('additionalProperties', () => (0, toAdditionalPropertiesV3_js_1.toAdditionalPropertiesV3)({ additionalProperties, context })),

package/script/oas/operation/toOperationsV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toOperationsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/toOperationsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAIjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAI1D,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAOD,eAAO,MAAM,aAAa,0CAIvB,iBAAiB,KAAG,YAuCtB,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,uBAAwB,kBAAkB,KAAG,YAAY,EAsDnF,CAAA"}
+{"version":3,"file":"toOperationsV3.d.ts","sourceRoot":"","sources":["../../../src/oas/operation/toOperationsV3.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAIjE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAI1D,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,WAAW,CAAA;CACtB,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAOD,eAAO,MAAM,aAAa,0CAIvB,iBAAiB,KAAG,YAwCtB,CAAA;AAED,KAAK,kBAAkB,GAAG;IACxB,KAAK,EAAE,SAAS,CAAC,WAAW,CAAA;IAC5B,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,cAAc,uBAAwB,kBAAkB,KAAG,YAAY,EAsDnF,CAAA"}

package/script/oas/operation/toOperationsV3.js

@@ -12,13 +12,14 @@ const toOperationV3 = ({ operation, operationInfo, context }) => {
     const { method, path, pathItem } = operationInfo;
     const { operationId, tags, summary, description, parameters, requestBody, responses, deprecated, ...skipped } = operation;
     const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({ skipped, context });
-    if (extensionFields && Object.keys(extensionFields).length > 0) {
-        context.registerExtension({
-            extensionFields,
-            type: 'operation',
-            stackTrail: ['operations', path, method]
-        });
-    }
+    context.registerExtension({
+        extensionFields: {
+            Label: extensionFields?.['x-label'] ?? '',
+            Description: extensionFields?.['x-description'] ?? ''
+        },
+        type: 'operation',
+        stackTrail: ['operations', `${method.toUpperCase()} ${path}`]
+    });
     return new Operation_js_1.OasOperation({
         pathItem,
         path,

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

@@ -6,22 +6,19 @@ type ToSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;
     context: ParseContext;
     childOfComponents?: boolean;
-    childOfObject?: boolean;
 };
-export declare const toSchemasV3: ({ schemas, context, childOfComponents, childOfObject }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
+export declare const toSchemasV3: ({ schemas, context, childOfComponents }: 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, childOfComponents, childOfObject }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
+export declare const toOptionalSchemasV3: ({ schemas, context, childOfComponents }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
 type ToSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
     context: ParseContext;
-    childOfComponents?: boolean;
 };
-export declare const toSchemaV3: ({ schema, context, childOfComponents }: ToSchemaV3Args) => OasSchema | OasRef<"schema">;
+export declare const toSchemaV3: ({ schema, context }: 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;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"}
+{"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;CAC5B,CAAA;AAED,eAAO,MAAM,WAAW,4CAIrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAoC/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;CAC5B,CAAA;AAED,eAAO,MAAM,mBAAmB,4CAI7B,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"}

package/script/oas/schema/toSchemasV3.js

@@ -14,20 +14,33 @@ 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 toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
-const toSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
+const toSchemasV3 = ({ schemas, context, childOfComponents }) => {
     return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
         return [
             key,
             context.trace(key, () => {
-                if ((childOfComponents || childOfObject) && !(0, refFns_js_1.isRef)(schema)) {
+                if (!(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'
-                    });
+                    if (childOfComponents) {
+                        context.registerExtension({
+                            extensionFields: {
+                                Label: extensionFields?.['x-label'] ?? '',
+                                Description: extensionFields?.['x-description'] ?? ''
+                            },
+                            stackTrail: ['models', key],
+                            type: 'schema'
+                        });
+                    }
+                    else {
+                        console.log('STACK TRAIL X', context.stackTrail.clone().toString());
+                        context.registerExtension({
+                            extensionFields: {
+                                Label: extensionFields?.['x-label'] ?? ''
+                            },
+                            stackTrail: ['models', 'XXX', key],
+                            type: 'schema'
+                        });
+                    }
                 }
                 return (0, exports.toSchemaV3)({ schema, context });
             })
@@ -35,14 +48,14 @@ const toSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) =>
     }));
 };
 exports.toSchemasV3 = toSchemasV3;
-const toOptionalSchemasV3 = ({ schemas, context, childOfComponents, childOfObject }) => {
+const toOptionalSchemasV3 = ({ schemas, context, childOfComponents }) => {
     if (!schemas) {
         return undefined;
     }
-    return (0, exports.toSchemasV3)({ schemas, context, childOfComponents, childOfObject });
+    return (0, exports.toSchemasV3)({ schemas, context, childOfComponents });
 };
 exports.toOptionalSchemasV3 = toOptionalSchemasV3;
-const toSchemaV3 = ({ schema, context, childOfComponents }) => {
+const toSchemaV3 = ({ schema, context }) => {
     if ((0, refFns_js_1.isRef)(schema)) {
         return (0, toRefV31_js_1.toRefV31)({ ref: schema, refType: 'schema', context });
     }
@@ -69,7 +82,7 @@ const toSchemaV3 = ({ schema, context, childOfComponents }) => {
         // }
         return context.trace('allOf', () => (0, toIntersection_js_1.toIntersection)({ value, members, context }));
     })
-        .with({ type: 'object' }, value => (0, toObject_js_1.toObject)({ value, context, childOfComponents }))
+        .with({ type: 'object' }, value => (0, toObject_js_1.toObject)({ value, context }))
         .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 }))