@redocly/openapi-core 0.0.0-snapshot.1744801622 → 0.0.0-snapshot.1747233324

package/package.json

@@ -1,11 +1,29 @@
 {
   "name": "@redocly/openapi-core",
-  "version": "0.0.0-snapshot.1744801622",
+  "version": "0.0.0-snapshot.1747233324",
   "description": "",
-  "main": "lib/index.js",
+  "type": "module",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./lib/config/config": {
+      "import": "./lib/config/index.js",
+      "require": "./lib/config/index.js",
+      "types": "./lib/config/index.d.ts"
+    },
+    "./lib/bundle": {
+      "import": "./lib/bundle.js",
+      "require": "./lib/bundle.js",
+      "types": "./lib/bundle.d.ts"
+    }
+  },
   "engines": {
-    "node": ">=18.17.0",
-    "npm": ">=9.5.0"
+    "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+    "npm": ">=10"
   },
   "engineStrict": true,
   "license": "MIT",
@@ -17,8 +35,12 @@
     "fs": false,
     "path": "path-browserify",
     "os": false,
-    "colorette": false,
-    "https-proxy-agent": false
+    "node:fs": false,
+    "node:path": "path-browserify",
+    "node:os": false,
+    "node:url": false,
+    "node:module": false,
+    "colorette": false
   },
   "homepage": "https://github.com/Redocly/redocly-cli",
   "keywords": [
@@ -36,19 +58,18 @@
   ],
   "dependencies": {
     "@redocly/ajv": "^8.11.2",
-    "@redocly/config": "^0.22.0",
+    "@redocly/config": "^0.24.1",
     "colorette": "^1.2.0",
-    "https-proxy-agent": "^7.0.5",
     "js-levenshtein": "^1.1.6",
     "js-yaml": "^4.1.0",
-    "minimatch": "^5.0.1",
+    "minimatch": "^10.0.1",
     "pluralize": "^8.0.0",
     "yaml-ast-parser": "0.0.43"
   },
   "devDependencies": {
     "@types/js-levenshtein": "^1.1.0",
     "@types/js-yaml": "^4.0.3",
-    "@types/minimatch": "^3.0.5",
+    "@types/minimatch": "^5.1.2",
     "@types/pluralize": "^0.0.29",
     "json-schema-to-ts": "^3.1.0",
     "typescript": "5.5.3"

package/lib/decorators/common/registry-dependencies.d.ts

@@ -1,2 +0,0 @@
-import type { Oas3Decorator, Oas2Decorator } from '../../visitors';
-export declare const RegistryDependencies: Oas3Decorator | Oas2Decorator;

package/lib/decorators/common/registry-dependencies.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistryDependencies = void 0;
-const domains_1 = require("../../redocly/domains");
-const RegistryDependencies = () => {
-    const registryDependencies = new Set();
-    return {
-        Root: {
-            leave(_, ctx) {
-                const data = ctx.getVisitorData();
-                data.links = Array.from(registryDependencies);
-            },
-        },
-        ref(node) {
-            if (node.$ref) {
-                const link = node.$ref.split('#/')[0];
-                if ((0, domains_1.isRedoclyRegistryURL)(link)) {
-                    registryDependencies.add(link);
-                }
-            }
-        },
-    };
-};
-exports.RegistryDependencies = RegistryDependencies;

package/lib/output.d.ts

@@ -1,3 +0,0 @@
-export declare const output: {
-    write(str: string): boolean | undefined;
-};

package/lib/output.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.output = void 0;
-const env_1 = require("./env");
-exports.output = {
-    write(str) {
-        return env_1.isBrowser ? undefined : process.stdout.write(str);
-    },
-};

package/lib/redocly/domains.d.ts

@@ -1,14 +0,0 @@
-import type { Region } from '../config/types';
-export declare const DEFAULT_REGION = "us";
-export declare const DOMAINS: {
-    us: string;
-    eu: string;
-};
-export declare const AVAILABLE_REGIONS: Region[];
-export declare function getDomains(): {
-    us: string;
-    eu: string;
-};
-export declare function setRedoclyDomain(domain: string): void;
-export declare function getRedoclyDomain(): string;
-export declare function isRedoclyRegistryURL(link: string): boolean;

package/lib/redocly/domains.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AVAILABLE_REGIONS = exports.DOMAINS = exports.DEFAULT_REGION = void 0;
-exports.getDomains = getDomains;
-exports.setRedoclyDomain = setRedoclyDomain;
-exports.getRedoclyDomain = getRedoclyDomain;
-exports.isRedoclyRegistryURL = isRedoclyRegistryURL;
-let redoclyDomain = 'redocly.com';
-exports.DEFAULT_REGION = 'us';
-exports.DOMAINS = getDomains();
-exports.AVAILABLE_REGIONS = Object.keys(exports.DOMAINS);
-function getDomains() {
-    const domains = {
-        us: 'redocly.com',
-        eu: 'eu.redocly.com',
-    };
-    // FIXME: temporary fix for our lab environments
-    const domain = redoclyDomain;
-    if (domain?.endsWith('.redocly.host')) {
-        domains[domain.split('.')[0]] = domain;
-    }
-    if (domain === 'redoc.online') {
-        domains[domain] = domain;
-    }
-    return domains;
-}
-function setRedoclyDomain(domain) {
-    redoclyDomain = domain;
-}
-function getRedoclyDomain() {
-    return redoclyDomain;
-}
-function isRedoclyRegistryURL(link) {
-    const domain = getRedoclyDomain() || exports.DOMAINS[exports.DEFAULT_REGION];
-    const legacyDomain = domain === 'redocly.com' ? 'redoc.ly' : domain;
-    if (!link.startsWith(`https://api.${domain}/registry/`) &&
-        !link.startsWith(`https://api.${legacyDomain}/registry/`)) {
-        return false;
-    }
-    return true;
-}

package/lib/redocly/index.d.ts

@@ -1,30 +0,0 @@
-import { RegistryApi } from './registry-api';
-import type { RegionalToken, RegionalTokenWithValidity } from './redocly-client-types';
-import type { AccessTokens, Region } from '../config/types';
-export declare const TOKEN_FILENAME = ".redocly-config.json";
-export declare class RedoclyClient {
-    private accessTokens;
-    private region;
-    domain: string;
-    registryApi: RegistryApi;
-    constructor(region?: Region);
-    loadRegion(region?: Region): Region;
-    getRegion(): Region;
-    hasTokens(): boolean;
-    hasToken(): boolean;
-    getAuthorizationHeader(): Promise<string | undefined>;
-    setAccessTokens(accessTokens: AccessTokens): void;
-    loadTokens(): void;
-    getAllTokens(): RegionalToken[];
-    getValidTokens(): Promise<RegionalTokenWithValidity[]>;
-    getTokens(): Promise<RegionalTokenWithValidity[]>;
-    isAuthorizedWithRedoclyByRegion(): Promise<boolean>;
-    isAuthorizedWithRedocly(): Promise<boolean>;
-    readCredentialsFile(credentialsPath: string): any;
-    verifyToken(accessToken: string, verbose?: boolean): Promise<{
-        viewerId: string;
-        organizations: string[];
-    }>;
-    login(accessToken: string, verbose?: boolean): Promise<void>;
-    logout(): void;
-}

package/lib/redocly/index.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoclyClient = exports.TOKEN_FILENAME = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const os_1 = require("os");
-const registry_api_1 = require("./registry-api");
-const env_1 = require("../env");
-const utils_1 = require("../utils");
-const logger_1 = require("../logger");
-const domains_1 = require("./domains");
-exports.TOKEN_FILENAME = '.redocly-config.json';
-class RedoclyClient {
-    constructor(region) {
-        this.accessTokens = {};
-        this.region = this.loadRegion(region);
-        this.loadTokens();
-        this.domain = region ? domains_1.DOMAINS[region] : env_1.env.REDOCLY_DOMAIN || domains_1.DOMAINS[domains_1.DEFAULT_REGION];
-        (0, domains_1.setRedoclyDomain)(this.domain);
-        this.registryApi = new registry_api_1.RegistryApi(this.accessTokens, this.region);
-    }
-    loadRegion(region) {
-        if (region && !domains_1.DOMAINS[region]) {
-            throw new Error(`Invalid argument: region in config file.\nGiven: ${logger_1.colorize.green(region)}, choices: "us", "eu".`);
-        }
-        if ((0, domains_1.getRedoclyDomain)()) {
-            return (domains_1.AVAILABLE_REGIONS.find((region) => domains_1.DOMAINS[region] === (0, domains_1.getRedoclyDomain)()) || domains_1.DEFAULT_REGION);
-        }
-        return region || domains_1.DEFAULT_REGION;
-    }
-    getRegion() {
-        return this.region;
-    }
-    hasTokens() {
-        return (0, utils_1.isNotEmptyObject)(this.accessTokens);
-    }
-    // <backward compatibility: old versions of portal>
-    hasToken() {
-        return !!this.accessTokens[this.region];
-    }
-    async getAuthorizationHeader() {
-        return this.accessTokens[this.region];
-    }
-    // </backward compatibility: portal>
-    setAccessTokens(accessTokens) {
-        this.accessTokens = accessTokens;
-    }
-    loadTokens() {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        const credentials = this.readCredentialsFile(credentialsPath);
-        if ((0, utils_1.isNotEmptyObject)(credentials)) {
-            this.setAccessTokens({
-                ...credentials,
-                ...(credentials.token &&
-                    !credentials[this.region] && {
-                    [this.region]: credentials.token,
-                }),
-            });
-        }
-        if (env_1.env.REDOCLY_AUTHORIZATION) {
-            this.setAccessTokens({
-                ...this.accessTokens,
-                [this.region]: env_1.env.REDOCLY_AUTHORIZATION,
-            });
-        }
-    }
-    getAllTokens() {
-        return Object.entries(this.accessTokens)
-            .filter(([region]) => domains_1.AVAILABLE_REGIONS.includes(region))
-            .map(([region, token]) => ({ region, token }));
-    }
-    async getValidTokens() {
-        const allTokens = this.getAllTokens();
-        const verifiedTokens = await Promise.allSettled(allTokens.map(({ token }) => this.verifyToken(token)));
-        return allTokens
-            .filter((_, index) => verifiedTokens[index].status === 'fulfilled')
-            .map(({ token, region }) => ({ token, region, valid: true }));
-    }
-    async getTokens() {
-        return this.hasTokens() ? await this.getValidTokens() : [];
-    }
-    async isAuthorizedWithRedoclyByRegion() {
-        if (!this.hasTokens()) {
-            return false;
-        }
-        const accessToken = this.accessTokens[this.region];
-        if (!accessToken) {
-            return false;
-        }
-        try {
-            await this.verifyToken(accessToken);
-            return true;
-        }
-        catch (err) {
-            return false;
-        }
-    }
-    async isAuthorizedWithRedocly() {
-        return this.hasTokens() && (0, utils_1.isNotEmptyArray)(await this.getValidTokens());
-    }
-    readCredentialsFile(credentialsPath) {
-        return (0, fs_1.existsSync)(credentialsPath) ? JSON.parse((0, fs_1.readFileSync)(credentialsPath, 'utf-8')) : {};
-    }
-    async verifyToken(accessToken, verbose = false) {
-        return this.registryApi.authStatus(accessToken, verbose);
-    }
-    async login(accessToken, verbose = false) {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        try {
-            await this.verifyToken(accessToken, verbose);
-        }
-        catch (err) {
-            throw new Error('Authorization failed. Please check if you entered a valid API key.');
-        }
-        const credentials = {
-            ...this.readCredentialsFile(credentialsPath),
-            [this.region]: accessToken,
-            token: accessToken, // FIXME: backward compatibility, remove on 1.0.0
-        };
-        this.accessTokens = credentials;
-        this.registryApi.setAccessTokens(credentials);
-        (0, fs_1.writeFileSync)(credentialsPath, JSON.stringify(credentials, null, 2));
-    }
-    logout() {
-        const credentialsPath = (0, path_1.resolve)((0, os_1.homedir)(), exports.TOKEN_FILENAME);
-        if ((0, fs_1.existsSync)(credentialsPath)) {
-            (0, fs_1.unlinkSync)(credentialsPath);
-        }
-    }
-}
-exports.RedoclyClient = RedoclyClient;

package/lib/redocly/redocly-client-types.d.ts

@@ -1,8 +0,0 @@
-import type { Region } from '../config/types';
-export interface RegionalToken {
-    region: Region;
-    token: string;
-}
-export interface RegionalTokenWithValidity extends RegionalToken {
-    valid: boolean;
-}

package/lib/redocly/redocly-client-types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/redocly/registry-api-types.d.ts

@@ -1,29 +0,0 @@
-interface VersionParams {
-    organizationId: string;
-    name: string;
-    version: string;
-}
-export interface PrepareFileuploadParams extends VersionParams {
-    filesHash: string;
-    filename: string;
-    isUpsert?: boolean;
-}
-export interface PushApiParams extends VersionParams {
-    rootFilePath: string;
-    filePaths: string[];
-    branch?: string;
-    isUpsert?: boolean;
-    isPublic?: boolean;
-    batchId?: string;
-    batchSize?: number;
-}
-export interface PrepareFileuploadOKResponse {
-    filePath: string;
-    signedUploadUrl: string;
-}
-export interface NotFoundProblemResponse {
-    status: 404;
-    title: 'Not Found';
-    code: 'ORGANIZATION_NOT_FOUND' | 'API_VERSION_NOT_FOUND';
-}
-export {};

package/lib/redocly/registry-api-types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/lib/redocly/registry-api.d.ts

@@ -1,17 +0,0 @@
-import type { PrepareFileuploadOKResponse, PrepareFileuploadParams, PushApiParams } from './registry-api-types';
-import type { AccessTokens, Region } from '../config/types';
-export declare class RegistryApi {
-    private accessTokens;
-    private region;
-    constructor(accessTokens: AccessTokens, region: Region);
-    get accessToken(): string | false | undefined;
-    getBaseUrl(): string;
-    setAccessTokens(accessTokens: AccessTokens): this;
-    private request;
-    authStatus(accessToken: string, verbose?: boolean): Promise<{
-        viewerId: string;
-        organizations: string[];
-    }>;
-    prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }: PrepareFileuploadParams): Promise<PrepareFileuploadOKResponse>;
-    pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, batchId, batchSize, }: PushApiParams): Promise<void>;
-}

package/lib/redocly/registry-api.js

@@ -1,100 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistryApi = void 0;
-const utils_1 = require("../utils");
-const domains_1 = require("./domains");
-const version = require('../../package.json').version;
-class RegistryApi {
-    constructor(accessTokens, region) {
-        this.accessTokens = accessTokens;
-        this.region = region;
-    }
-    get accessToken() {
-        return (0, utils_1.isNotEmptyObject)(this.accessTokens) && this.accessTokens[this.region];
-    }
-    getBaseUrl() {
-        return `https://api.${(0, domains_1.getRedoclyDomain)()}/registry`;
-    }
-    setAccessTokens(accessTokens) {
-        this.accessTokens = accessTokens;
-        return this;
-    }
-    async request(path = '', options = {}) {
-        const currentCommand = typeof process !== 'undefined' ? process.env?.REDOCLY_CLI_COMMAND || '' : '';
-        const redoclyEnv = typeof process !== 'undefined' ? process.env?.REDOCLY_ENVIRONMENT || '' : '';
-        const headers = Object.assign({}, options.headers || {}, {
-            'x-redocly-cli-version': version,
-            'user-agent': `redocly-cli / ${version} ${currentCommand} ${redoclyEnv}`,
-        });
-        if (!headers.hasOwnProperty('authorization')) {
-            throw new Error('Unauthorized');
-        }
-        const requestOptions = {
-            ...options,
-            headers,
-            agent: (0, utils_1.getProxyAgent)(),
-        };
-        const response = await fetch(`${this.getBaseUrl()}${path}`, requestOptions);
-        if (response.status === 401) {
-            throw new Error('Unauthorized');
-        }
-        if (response.status === 404) {
-            const body = await response.json();
-            throw new Error(body.code);
-        }
-        return response;
-    }
-    async authStatus(accessToken, verbose = false) {
-        try {
-            const response = await this.request('', { headers: { authorization: accessToken } });
-            return await response.json();
-        }
-        catch (error) {
-            if (verbose) {
-                console.log(error);
-            }
-            throw error;
-        }
-    }
-    async prepareFileUpload({ organizationId, name, version, filesHash, filename, isUpsert, }) {
-        const response = await this.request(`/${organizationId}/${name}/${version}/prepare-file-upload`, {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                authorization: this.accessToken,
-            },
-            body: JSON.stringify({
-                filesHash,
-                filename,
-                isUpsert,
-            }),
-        });
-        if (response.ok) {
-            return response.json();
-        }
-        throw new Error('Could not prepare file upload');
-    }
-    async pushApi({ organizationId, name, version, rootFilePath, filePaths, branch, isUpsert, isPublic, batchId, batchSize, }) {
-        const response = await this.request(`/${organizationId}/${name}/${version}`, {
-            method: 'PUT',
-            headers: {
-                'content-type': 'application/json',
-                authorization: this.accessToken,
-            },
-            body: JSON.stringify({
-                rootFilePath,
-                filePaths,
-                branch,
-                isUpsert,
-                isPublic,
-                batchId,
-                batchSize,
-            }),
-        });
-        if (response.ok) {
-            return;
-        }
-        throw new Error('Could not push api');
-    }
-}
-exports.RegistryApi = RegistryApi;