diff --git a/package.json b/package.json index d262026ed9..31e96143d3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "openapi-workspaces", "license": "MIT", "private": true, - "version": "0.55.0", + "version": "0.55.1", "workspaces": [ "projects/json-pointer-helpers", "projects/openapi-io", diff --git a/projects/fastify-capture/package.json b/projects/fastify-capture/package.json index 3cf597f165..014cccae63 100644 --- a/projects/fastify-capture/package.json +++ b/projects/fastify-capture/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/fastify-capture", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/json-pointer-helpers/package.json b/projects/json-pointer-helpers/package.json index e060c9d220..7b41293006 100644 --- a/projects/json-pointer-helpers/package.json +++ b/projects/json-pointer-helpers/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/json-pointer-helpers", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/openapi-io/package.json b/projects/openapi-io/package.json index 4ef04a2684..baf23f7410 100644 --- a/projects/openapi-io/package.json +++ b/projects/openapi-io/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/openapi-io", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/openapi-utilities/package.json b/projects/openapi-utilities/package.json index d147dd8841..8e14008ffe 100644 --- a/projects/openapi-utilities/package.json +++ b/projects/openapi-utilities/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/openapi-utilities", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/optic/package.json b/projects/optic/package.json index b288bcb620..e98591ae41 100644 --- a/projects/optic/package.json +++ b/projects/optic/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/optic", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/optic/src/commands/diff/diff-all.ts b/projects/optic/src/commands/diff/diff-all.ts index 3b8fc7c4dc..d3d5b8ec8d 100644 --- a/projects/optic/src/commands/diff/diff-all.ts +++ b/projects/optic/src/commands/diff/diff-all.ts @@ -653,7 +653,11 @@ const getDiffAllAction = ); process.exitCode = 1; return; - } else if (options.upload && !config.isAuthenticated) { + } else if ( + options.upload && + !config.isAuthenticated && + !customOptions.customUpload + ) { logger.error( chalk.bold.red( 'Error: Must be logged in to upload results. Run optic login to authenticate.' diff --git a/projects/optic/src/commands/diff/diff.ts b/projects/optic/src/commands/diff/diff.ts index ff4f37a01b..a0549fdf6d 100644 --- a/projects/optic/src/commands/diff/diff.ts +++ b/projects/optic/src/commands/diff/diff.ts @@ -309,7 +309,11 @@ const getDiffAction = // For json output we only want to render json logger.setLevel('silent'); } - if (options.upload && !config.isAuthenticated) { + if ( + options.upload && + !config.isAuthenticated && + !customOptions.customUpload + ) { logger.error( chalk.bold.red( 'Error: Must be logged in to upload results. Run optic login to authenticate.' diff --git a/projects/optic/src/utils/spec-loaders.ts b/projects/optic/src/utils/spec-loaders.ts index 18569a3e22..b8a9581d98 100644 --- a/projects/optic/src/utils/spec-loaders.ts +++ b/projects/optic/src/utils/spec-loaders.ts @@ -53,18 +53,21 @@ export type ParseResult = | (ParseOpenAPIResult & { isEmptySpec: boolean; from: 'git' | 'file' | 'url' | 'empty' | 'cloud'; + fileContext: SpecFromInput; version: '2.x.x'; context: ParseResultContext; }) | (ParseOpenAPIResult & { isEmptySpec: boolean; from: 'git' | 'file' | 'url' | 'empty' | 'cloud'; + fileContext: SpecFromInput; version: '3.0.x'; context: ParseResultContext; }) | (ParseOpenAPIResult & { isEmptySpec: boolean; from: 'git' | 'file' | 'url' | 'empty' | 'cloud'; + fileContext: SpecFromInput; version: '3.1.x'; context: ParseResultContext; }); @@ -209,6 +212,7 @@ async function parseSpecAndDereference( const sourcemap = createNullSpecSourcemap(spec); return { jsonLike: spec, + fileContext: input, sourcemap, from: 'empty', version: '3.0.x', @@ -225,6 +229,7 @@ async function parseSpecAndDereference( ); return { jsonLike, + fileContext: input, sourcemap, version: checkOpenAPIVersion(jsonLike), from: 'cloud', @@ -255,6 +260,7 @@ async function parseSpecAndDereference( ...parseResult, version: checkOpenAPIVersion(parseResult.jsonLike), from: 'git', + fileContext: input, isEmptySpec: false, context: { vcs: 'git', @@ -273,7 +279,7 @@ async function parseSpecAndDereference( return { ...parseResult, version: checkOpenAPIVersion(parseResult.jsonLike), - + fileContext: input, from: 'url', isEmptySpec: false, context: null, @@ -303,6 +309,7 @@ async function parseSpecAndDereference( return { ...parseResult, + fileContext: input, version: checkOpenAPIVersion(parseResult.jsonLike), from: 'file', isEmptySpec: false, diff --git a/projects/rulesets-base/package.json b/projects/rulesets-base/package.json index 36675b92d5..f13e7a63c0 100644 --- a/projects/rulesets-base/package.json +++ b/projects/rulesets-base/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/rulesets-base", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [ diff --git a/projects/standard-rulesets/package.json b/projects/standard-rulesets/package.json index 073cbbf20d..cd71d310d3 100644 --- a/projects/standard-rulesets/package.json +++ b/projects/standard-rulesets/package.json @@ -2,7 +2,7 @@ "name": "@useoptic/standard-rulesets", "license": "MIT", "packageManager": "yarn@4.1.1", - "version": "0.55.0", + "version": "0.55.1", "main": "build/index.js", "types": "build/index.d.ts", "files": [