bdy 1.25.1-stage → 1.25.2-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.25.1-stage",
+  "version": "1.25.2-beta",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",
@@ -50,14 +50,12 @@
   ],
   "dependencies": {
     "@buddy-works/ci-info": "1.1.7",
+    "@buddy-works/docs-schema": "0.1.3",
     "@fastify/accept-negotiator": "2.0.1",
     "@fastify/cors": "11.2.0",
     "@inquirer/prompts": "8.5.2",
     "@modelcontextprotocol/sdk": "1.30.0",
     "@puppeteer/browsers": "3.2.0",
-    "@scalar/json-magic": "0.12.16",
-    "@scalar/openapi-parser": "0.28.7",
-    "@scalar/openapi-types": "0.9.1",
     "@xhmikosr/decompress": "11.1.3",
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",
@@ -77,7 +75,6 @@
     "jsonwebtoken": "9.0.3",
     "mime-db": "1.54.0",
     "mime-types": "3.0.2",
-    "minisearch": "7.2.0",
     "netmask": "2.1.1",
     "node-forge": "1.4.0",
     "open": "11.0.0",
@@ -105,7 +102,6 @@
     "@rollup/plugin-json": "6.1.0",
     "@rollup/plugin-node-resolve": "16.0.3",
     "@rollup/plugin-replace": "6.0.3",
-    "@scalar/types": "0.13.2",
     "@stylistic/eslint-plugin": "5.10.0",
     "@types/basic-auth": "1.1.8",
     "@types/content-disposition": "0.5.9",

package/distTs/src/command/api/info.js

@@ -7,259 +7,255 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
-const logger_1 = __importDefault(require("../../logger"));
-var SCHEMA_TYPE;
-(function (SCHEMA_TYPE) {
-    SCHEMA_TYPE["OBJECT"] = "object";
-    SCHEMA_TYPE["ARRAY"] = "array";
-})(SCHEMA_TYPE || (SCHEMA_TYPE = {}));
-const getRequiredScopes = (data) => {
-    if (data.security && data.security[0] && data.security[0].oauth2) {
-        return data.security[0].oauth2;
-    }
-    return [];
+/** `members` keeps declaration order, which numbers the listing; `values` does not. */
+const orderedMembers = (body) => {
+    if (body.kind !== 'union')
+        return [];
+    const members = body.discriminator?.members;
+    return members ? Object.keys(members) : body.variants.map((one) => one.name);
+};
+const memberDef = (body, name) => body.discriminator?.members?.[name] ?? body.variants.find((one) => one.name === name)?.ref?.name;
+const unionsOf = (doc) => {
+    const bodies = [];
+    for (const content of doc.request?.contents ?? [])
+        bodies.push(content.body);
+    for (const response of doc.responses)
+        for (const content of response.contents)
+            bodies.push(content.body);
+    return bodies.filter((body) => body.kind === 'union');
 };
-const getParameterType = (p) => {
-    if (p.schema && p.schema.type) {
-        return p.schema.type;
+const memberMeta = async (api, doc) => {
+    const defs = new Set();
+    for (const body of unionsOf(doc)) {
+        if (body.kind !== 'union')
+            continue;
+        for (const name of orderedMembers(body)) {
+            const def = memberDef(body, name);
+            if (def)
+                defs.add(def);
+        }
+    }
+    const meta = new Map();
+    for (const def of defs) {
+        const type = await api.type(def);
+        const shown = type?.extensions?.['x-name'];
+        meta.set(def, {
+            ...(typeof shown === 'string' ? { shown } : {}),
+            deprecated: type?.deprecated === true,
+        });
     }
-    return 'string';
+    return meta;
 };
-const outputParameters = (type, data, workspace, project) => {
-    const table = [];
-    (data.parameters || []).forEach((p) => {
-        if (p.in === type) {
-            let example = '-';
-            if (p.name === 'workspace_domain')
-                example = workspace;
-            else if (p.name === 'project_name' && project)
-                example = project;
-            else if (p.schema && p.schema.example)
-                example = p.schema.example;
-            table.push([
-                p.name || '-',
-                getParameterType(p),
-                example.toString(),
-                p.description || '-',
-            ]);
+const scopesOf = (security) => {
+    const found = new Set();
+    for (const alternative of security) {
+        for (const requirement of alternative) {
+            for (const scope of requirement.scopes)
+                found.add(scope);
         }
-    });
-    if (table.length > 0) {
-        table.unshift([
-            type === 'path' ? 'URL param' : 'Query param',
-            'Type',
-            'Example',
-            'Description',
+    }
+    return [...found];
+};
+const exampleOf = (field, workspace, project) => {
+    if (field.name === 'workspace_domain')
+        return workspace;
+    if (field.name === 'project_name' && project)
+        return project;
+    return field.example === undefined ? '-' : String(field.example);
+};
+const outputParameters = (label, fields, workspace, project) => {
+    if (fields.length === 0)
+        return;
+    const table = [[label, 'Type', 'Example', 'Description']];
+    for (const field of fields) {
+        table.push([
+            field.name || '-',
+            field.type || 'string',
+            exampleOf(field, workspace, project),
+            field.description || '-',
         ]);
-        output_1.default.table(table);
-        output_1.default.normal('');
     }
+    output_1.default.table(table);
+    output_1.default.normal('');
 };
 const outputTextWithPadding = (text, padding = 1, newLine = true) => {
-    let t = '';
-    for (let i = 0; i < padding; i += 1)
-        t += ' ';
-    t += text;
-    output_1.default.normal(t, newLine);
+    output_1.default.normal(' '.repeat(padding) + text, newLine);
 };
-const outputSimpleProp = (name, type, description, enu, required, padding) => {
+const outputSimpleProp = (name, type, description, enumValues, required, padding) => {
     outputTextWithPadding(name, padding, false);
     output_1.default.gray(`: ${type}`, false);
     if (required)
         output_1.default.gray(' (required)', false);
     if (description)
         output_1.default.gray(` - ${description}`, false);
-    if (enu && enu.length)
-        output_1.default.gray(` - ${enu.join(', ')}`, false);
+    if (enumValues && enumValues.length)
+        output_1.default.gray(` - ${enumValues.join(', ')}`, false);
     output_1.default.normal('');
 };
-const outputJsonArrayProp = (data, padding, name, required) => {
-    if (name) {
-        outputTextWithPadding(name, padding, false);
-        output_1.default.gray(`: ${SCHEMA_TYPE.ARRAY}`, false);
-        if (required)
-            output_1.default.gray(' (required)', false);
-        if (data.description)
-            output_1.default.gray(` - ${data.description}`, false);
-        output_1.default.normal('');
+const fieldsOf = (field, types) => field.ref?.elsewhere ? (types?.[field.ref.name]?.fields ?? []) : (field.fields ?? []);
+const outputField = (field, padding, ctx, onPath) => {
+    if (field.constraints?.format === 'binary') {
+        outputSimpleProp(field.name, field.ref?.array ? 'binary array' : 'binary', field.description, undefined, field.required, padding);
+        return;
     }
-    outputTextWithPadding('[', padding);
-    if (name === 'trigger_operands') {
-        outputTextWithPadding(' {...}', padding);
+    const named = field.ref?.name;
+    const children = named !== undefined && onPath.has(named) ? [] : fieldsOf(field, ctx.types);
+    const deeper = named === undefined ? onPath : new Set(onPath).add(named);
+    if (children.length === 0) {
+        outputSimpleProp(field.name, field.type, field.description, field.enum, field.required, padding);
+        return;
     }
-    else {
-        if (data.items.type === SCHEMA_TYPE.OBJECT)
-            outputJsonObject(data.items, padding + 2);
-        else if (data.items.type === SCHEMA_TYPE.ARRAY)
-            outputJsonArrayProp(data.items, padding + 2);
-        else
-            outputSimpleProp('item', data.items.type, data.items.description, data.items.enum, false, padding + 2);
+    if (field.ref?.array) {
+        outputSimpleProp(field.name, 'array', field.description, undefined, field.required, padding);
+        outputTextWithPadding('[', padding);
+        outputFields(children, padding + 2, ctx, deeper);
+        outputTextWithPadding(']', padding);
+        return;
     }
-    outputTextWithPadding(']', padding);
+    outputTextWithPadding(field.name, padding, false);
+    output_1.default.gray(' : object', false);
+    if (field.required)
+        output_1.default.gray(' (required)', false);
+    if (field.description)
+        output_1.default.gray(` - ${field.description}`, false);
+    output_1.default.normal('');
+    outputFields(children, padding, ctx, deeper);
 };
-const outputJsonObject = (data, padding = 1, name, required) => {
-    const propsRequired = data.required || [];
-    const props = data.properties || {};
-    if (name) {
-        outputTextWithPadding(name, padding, false);
-        output_1.default.gray(` : ${SCHEMA_TYPE.OBJECT}`, false);
-        if (required)
-            output_1.default.gray(' (required)', false);
-        if (data.description)
-            output_1.default.gray(` - ${data.description}`, false);
-        output_1.default.normal('');
-    }
+const outputFields = (fields, padding, ctx, onPath = new Set()) => {
     outputTextWithPadding('{', padding);
-    const keys = Object.keys(props);
-    if (keys.length > 0) {
-        keys.forEach((name) => {
-            const prop = props[name];
-            if (prop.type === SCHEMA_TYPE.ARRAY)
-                outputJsonArrayProp(prop, padding + 2, name, propsRequired.includes(name));
-            else if (prop.type === SCHEMA_TYPE.OBJECT)
-                outputJsonObject(prop, padding + 2, name, propsRequired.includes(name));
-            else
-                outputSimpleProp(name, prop.type, prop.description, prop.enum, propsRequired.includes(name), padding + 2);
-        });
-    }
-    else if (data.additionalProperties) {
-        outputTextWithPadding('key: value', padding + 2, false);
-        if (data.additionalProperties.description)
-            output_1.default.gray(` - ${data.additionalProperties.description}`, false);
-        output_1.default.normal('');
-    }
+    for (const field of fields)
+        outputField(field, padding + 2, ctx, onPath);
     outputTextWithPadding('}', padding);
 };
-const outputMultipartBinary = (name, array, description, required, padding) => {
-    outputTextWithPadding(name, padding, false);
-    output_1.default.gray(array ? ': binary array' : ': binary', false);
-    if (required)
-        output_1.default.gray(' (required)', false);
-    if (description)
-        output_1.default.gray(` - ${description}`, false);
-    output_1.default.normal('');
-};
-const outputMultipartFormData = (data, padding = 1) => {
-    const propsRequired = data.required || [];
-    const props = data.properties || {};
-    const keys = Object.keys(props);
-    if (keys.length > 0) {
-        keys.forEach((name) => {
-            const prop = props[name];
-            if (prop.format === 'binary')
-                outputMultipartBinary(name, prop.type === 'array', prop.description, propsRequired.includes(name), padding);
-            else if (prop.type === SCHEMA_TYPE.ARRAY)
-                output_1.default.exitError(texts_1.ERR_API_MEDIA_TYPE_NOT_IMPLEMENTED);
-            else if (prop.type === SCHEMA_TYPE.OBJECT)
-                output_1.default.exitError(texts_1.ERR_API_MEDIA_TYPE_NOT_IMPLEMENTED);
-            else
-                outputSimpleProp(name, prop.type, prop.description, prop.enum, propsRequired.includes(name), padding);
-        });
+const outputUnion = (body, ctx, padding) => {
+    const names = orderedMembers(body);
+    // One variant means one was asked for; more than one is the listing.
+    const shown = body.variants.length === 1 ? body.variants[0] : undefined;
+    if (shown) {
+        outputFields([...body.shared, ...shown.fields], padding, ctx);
+        return;
     }
+    output_1.default.gray(` media type contains ${names.length} schemas:`);
+    names.forEach((name, index) => {
+        const def = memberDef(body, name);
+        const meta = def ? ctx.members.get(def) : undefined;
+        outputTextWithPadding(`${index + 1}: ${name}`, padding, false);
+        if (meta?.deprecated)
+            output_1.default.gray(' (deprecated)', false);
+        if (meta?.shown)
+            output_1.default.gray(` - ${meta.shown}`, false);
+        output_1.default.normal('');
+    });
+    outputTextWithPadding(`pass ${ctx.flag} with number or type to view it`);
 };
-const outputBodyObject = (mediaType, data) => {
-    if (mediaType === 'multipart/form-data') {
-        outputMultipartFormData(data);
-    }
-    else if (['application/json', 'application/jsonl'].includes(mediaType)) {
-        outputJsonObject(data);
+const outputBody = (body, ctx, padding = 1) => {
+    switch (body.kind) {
+        case 'none':
+            return;
+        case 'fields':
+            outputFields(body.fields, padding, ctx);
+            return;
+        case 'array':
+            outputTextWithPadding('[', padding);
+            outputBody(body.items, ctx, padding + 2);
+            outputTextWithPadding(']', padding);
+            return;
+        case 'value': {
+            outputTextWithPadding(body.type, padding, false);
+            if (body.description)
+                output_1.default.gray(` - ${body.description}`, false);
+            if (body.enum?.length)
+                output_1.default.gray(` - ${body.enum.join(', ')}`, false);
+            output_1.default.normal('');
+            return;
+        }
+        case 'union':
+            outputUnion(body, ctx, padding);
+            return;
     }
-    else {
-        output_1.default.exitError((0, texts_1.ERR_API_MEDIA_TYPE_NOT_IMPLEMENTED)(mediaType));
+};
+const outputContent = (content, ctx, first) => {
+    if (!first)
+        output_1.default.gray(' ------- or content type -------');
+    output_1.default.gray(' content-type: ', false);
+    output_1.default.normal(content.contentType ?? '-');
+    if (content.contentType === 'multipart/form-data' && content.body.kind === 'fields') {
+        for (const field of content.body.fields)
+            outputField(field, 1, ctx, new Set());
+        return;
     }
+    outputBody(content.body, ctx);
 };
-const outputResponse = (response, schema) => {
-    const content = response.content || {};
-    Object.keys(content).forEach((mediaType, index) => {
-        if (index > 0) {
-            output_1.default.gray(' ------- or content type -------');
-        }
-        outputMediaType(mediaType, content[mediaType], 'response-schema', schema);
+const outputRequestBody = (doc, members) => {
+    // Declared with no content is not absent, and the header is all there is to say.
+    if (!doc.request)
+        return;
+    const contents = doc.request.contents;
+    const ctx = { types: doc.types, members, flag: '--request-schema' };
+    output_1.default.blue(` Request body`);
+    contents.forEach((content, index) => outputContent(content, ctx, index === 0));
+    output_1.default.normal('');
+};
+const outputResponsesBody = (doc, members) => {
+    if (doc.responses.length === 0)
+        return;
+    const ctx = { types: doc.types, members, flag: '--response-schema' };
+    output_1.default.blue(` Response body`);
+    doc.responses.forEach((response, index) => {
+        if (index > 0)
+            output_1.default.gray(' ------------');
+        output_1.default.gray(' http status: ', false);
+        output_1.default.normal(response.status);
+        response.contents.forEach((content, i) => outputContent(content, ctx, i === 0));
     });
 };
-const outputResponsesBody = (responses, schema) => {
-    const r = responses || {};
-    const codes = Object.keys(r);
-    if (codes.length > 0) {
-        output_1.default.blue(` Response body`);
-        codes.forEach((code, index) => {
-            if (index > 0) {
-                output_1.default.gray(' ------------');
-            }
-            output_1.default.gray(' http status: ', false);
-            output_1.default.normal(code);
-            outputResponse(r[code], schema);
-        });
-    }
+const chosen = (asked, names) => {
+    if (!asked)
+        return undefined;
+    if (names.includes(asked))
+        return asked;
+    const position = Number(asked);
+    return Number.isInteger(position) && position >= 1 ? names[position - 1] : undefined;
 };
-const outputMediaType = (mediaType, mediaTypeObject, schemaParamName, userSchema) => {
-    output_1.default.gray(' content-type: ', false);
-    output_1.default.normal(mediaType);
-    if (mediaTypeObject.schema) {
-        if (mediaTypeObject.schema.oneOf) {
-            const schemas = mediaTypeObject.schema.oneOf;
-            if (!schemas.length) {
-                output_1.default.exitError(' media type does not contain any schemas');
-            }
-            else if (schemas.length === 1) {
-                outputBodyObject(mediaType, schemas[0]);
-            }
-            else {
-                const mappings = Object.keys(mediaTypeObject.schema.discriminator?.mapping || {});
-                for (let i = 1; i <= schemas.length; i += 1) {
-                    if (i.toString() === userSchema) {
-                        outputBodyObject(mediaType, schemas[i]);
-                        return;
-                    }
-                }
-                for (let i = 0; i < mappings.length; i += 1) {
-                    if (mappings[i] === userSchema) {
-                        const schema = schemas[i];
-                        if (schema) {
-                            outputBodyObject(mediaType, schema);
-                            return;
-                        }
-                    }
-                }
-                output_1.default.gray(` media type contains ${schemas.length} schemas:`);
-                for (let i = 1; i <= schemas.length; i += 1) {
-                    const mapping = mappings[i - 1];
-                    const name = mapping ? `${i}: ${mapping}` : `${i}`;
-                    outputTextWithPadding(name, 1, false);
-                    const schema = schemas[i - 1];
-                    logger_1.default.info(schema);
-                    if (schema) {
-                        if (schema.deprecated)
-                            output_1.default.gray(` (deprecated)`, false);
-                        const desc = schema['x-name'] || schema.title || schema.description;
-                        if (desc)
-                            output_1.default.gray(` - ${desc}`, false);
-                    }
-                    output_1.default.normal('');
-                }
-                outputTextWithPadding(`pass --${schemaParamName} with number or type to view it`);
-            }
-        }
-        else {
-            outputBodyObject(mediaType, mediaTypeObject.schema);
-        }
+const commandApiInfo = (0, utils_1.newCommand)('info', texts_1.DESC_COMMAND_API_INFO);
+commandApiInfo.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandApiInfo.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandApiInfo.option('--request-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
+commandApiInfo.option('--response-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
+commandApiInfo.argument('<method>', texts_1.OPT_COMMAND_API_INFO_METHOD);
+commandApiInfo.argument('<url>', texts_1.OPT_COMMAND_API_INFO_URL);
+commandApiInfo.action(async (fm, filterUrl, options) => {
+    const { apiEndpoints } = require('../../openapi');
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const project = input_1.default.restApiProject(options.project, true);
+    const method = (input_1.default.restApiMethod(fm, false) ?? '').toLowerCase();
+    const client = input_1.default.restApiTokenClient(true);
+    const api = await apiEndpoints(client.baseUrl);
+    const wanted = (await api.operations()).find((operation) => operation.method.toLowerCase() === method &&
+        (operation.path === filterUrl ||
+            (0, utils_1.openApiPrepareUrl)(operation.path, workspace, project) === filterUrl));
+    if (!wanted) {
+        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        return;
     }
-};
-const outputRequestBody = (data, schema) => {
-    if (data) {
-        output_1.default.blue(` Request body`);
-        const content = data.content || {};
-        Object.keys(content).forEach((mediaType, index) => {
-            if (index > 0) {
-                output_1.default.gray(' ------- or content type -------');
-            }
-            outputMediaType(mediaType, content[mediaType], 'request-schema', schema);
-        });
-        output_1.default.normal('');
+    const listed = await api.endpoint(wanted.method, wanted.path);
+    if (!listed) {
+        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        return;
     }
-};
-const outputUrl = (url, method, data, workspace, project, requestSchema, responseSchema) => {
-    const m = (method || 'get').toUpperCase();
+    const namesOf = (bodies) => bodies.flatMap((body) => [...orderedMembers(body)]);
+    const request = chosen(options.requestSchema, namesOf((listed.request?.contents ?? []).map((content) => content.body)));
+    const response = chosen(options.responseSchema, namesOf(listed.responses.flatMap((one) => one.contents.map((content) => content.body))));
+    const member = request || response
+        ? { ...(request ? { request } : {}), ...(response ? { response } : {}) }
+        : undefined;
+    const doc = member ? await api.endpoint(wanted.method, wanted.path, member) : listed;
+    if (!doc) {
+        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        return;
+    }
+    const members = await memberMeta(api, doc);
+    const m = doc.method.toUpperCase();
     if (m === 'GET')
         output_1.default.cyan(m, false);
     else if (m === 'POST')
@@ -270,48 +266,21 @@ const outputUrl = (url, method, data, workspace, project, requestSchema, respons
         output_1.default.yellow(m, false);
     else if (m === 'DELETE')
         output_1.default.error(m, false);
-    output_1.default.normal(` ${url}`);
-    if (data.summary)
-        output_1.default.gray(data.summary, false);
-    const scopes = getRequiredScopes(data);
+    output_1.default.normal(` ${(0, utils_1.openApiPrepareUrl)(doc.path, workspace, project)}`);
+    if (doc.summary)
+        output_1.default.gray(doc.summary, false);
+    const scopes = scopesOf(doc.security);
     if (scopes.length > 0) {
-        if (data.summary)
+        if (doc.summary)
             output_1.default.gray('. ', false);
         output_1.default.gray(`${texts_1.TXT_API_ENDPOINT_REQUIRED_SCOPES}: `, false);
         output_1.default.gray(scopes.join(', '), false);
     }
     output_1.default.normal('\n');
-    outputParameters('path', data, workspace, project);
-    outputParameters('query', data, workspace, project);
-    outputRequestBody(data.requestBody, requestSchema);
-    outputResponsesBody(data.responses, responseSchema);
+    outputParameters('URL param', doc.parameters.path ?? [], workspace, project);
+    outputParameters('Query param', doc.parameters.query ?? [], workspace, project);
+    outputRequestBody(doc, members);
+    outputResponsesBody(doc, members);
     output_1.default.exitNormal();
-};
-const commandApiInfo = (0, utils_1.newCommand)('info', texts_1.DESC_COMMAND_API_INFO);
-commandApiInfo.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
-commandApiInfo.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
-commandApiInfo.option('--request-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
-commandApiInfo.option('--response-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
-commandApiInfo.argument('<method>', texts_1.OPT_COMMAND_API_INFO_METHOD);
-commandApiInfo.argument('<url>', texts_1.OPT_COMMAND_API_INFO_URL);
-commandApiInfo.action(async (fm, filterUrl, options) => {
-    const { fetchOpenApiSchema } = require('../../openapi');
-    const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const project = input_1.default.restApiProject(options.project, true);
-    const filterMethod = input_1.default.restApiMethod(fm, false);
-    const client = input_1.default.restApiTokenClient(true);
-    const schema = await fetchOpenApiSchema(client.baseUrl);
-    const paths = schema.paths || {};
-    Object.keys(paths).forEach((url) => {
-        const preparedUrl = (0, utils_1.openApiPrepareUrl)(url, workspace, project);
-        if (filterUrl === url || filterUrl === preparedUrl) {
-            const methods = paths[url] || {};
-            Object.entries(methods).forEach(([method, data]) => {
-                if (filterMethod === method)
-                    outputUrl(preparedUrl, method, data, workspace, project, options.requestSchema, options.responseSchema);
-            });
-        }
-    });
-    output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
 });
 exports.default = commandApiInfo;

package/distTs/src/command/api/list.js

@@ -7,8 +7,8 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
-const outputUrl = (url, method, data, workspace, project) => {
-    const m = (method || 'get').toUpperCase();
+const outputUrl = (operation, workspace, project) => {
+    const m = operation.method.toUpperCase();
     if (m === 'GET')
         output_1.default.cyan(m, false);
     else if (m === 'POST')
@@ -21,9 +21,9 @@ const outputUrl = (url, method, data, workspace, project) => {
         output_1.default.error(m, false);
     else
         output_1.default.blue(m, false);
-    output_1.default.normal(` ${(0, utils_1.openApiPrepareUrl)(url, workspace, project)}`);
-    if (data.summary)
-        output_1.default.gray(data.summary);
+    output_1.default.normal(` ${(0, utils_1.openApiPrepareUrl)(operation.path, workspace, project)}`);
+    if (operation.summary)
+        output_1.default.gray(operation.summary);
 };
 const commandApiList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_API_LIST);
 commandApiList.alias('ls');
@@ -32,23 +32,20 @@ commandApiList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandApiList.option('-m, --method <method>', texts_1.OPT_COMMAND_API_LIST_METHOD);
 commandApiList.option('-s, --search <phrase>', texts_1.OPT_COMMAND_API_LIST_SEARCH);
 commandApiList.action(async (options) => {
-    const { fetchOpenApiSchema } = require('../../openapi');
+    const { apiEndpoints } = require('../../openapi');
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
     const filterMethod = input_1.default.restApiMethod(options.method);
     const filter = options.search;
     const client = input_1.default.restApiTokenClient(true);
-    const schema = await fetchOpenApiSchema(client.baseUrl);
-    const paths = schema.paths || {};
-    Object.keys(paths).forEach((url) => {
-        if (!filter || url.includes(filter)) {
-            const methods = paths[url] || {};
-            Object.entries(methods).forEach(([method, data]) => {
-                if (!filterMethod || filterMethod === method)
-                    outputUrl(url, method, data, workspace, project);
-            });
-        }
-    });
+    const api = await apiEndpoints(client.baseUrl);
+    for (const operation of await api.operations()) {
+        if (filter && !operation.path.includes(filter))
+            continue;
+        if (filterMethod && filterMethod !== operation.method.toLowerCase())
+            continue;
+        outputUrl(operation, workspace, project);
+    }
     output_1.default.exitNormal();
 });
 exports.default = commandApiList;