diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 454c2d9fb..1b5bdc30d 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -107072,10 +107072,10 @@ var require_util20 = __commonJS({ return typeof arg === "number"; } exports2.isNumber = isNumber; - function isString(arg) { + function isString2(arg) { return typeof arg === "string"; } - exports2.isString = isString; + exports2.isString = isString2; function isSymbol(arg) { return typeof arg === "symbol"; } @@ -107088,10 +107088,10 @@ var require_util20 = __commonJS({ return objectToString(re) === "[object RegExp]"; } exports2.isRegExp = isRegExp; - function isObject2(arg) { + function isObject3(arg) { return typeof arg === "object" && arg !== null; } - exports2.isObject = isObject2; + exports2.isObject = isObject3; function isDate(d) { return objectToString(d) === "[object Date]"; } @@ -109133,11 +109133,11 @@ var require_baseGetTag = __commonJS({ // node_modules/lodash/isObject.js var require_isObject = __commonJS({ "node_modules/lodash/isObject.js"(exports2, module2) { - function isObject2(value) { + function isObject3(value) { var type2 = typeof value; return value != null && (type2 == "object" || type2 == "function"); } - module2.exports = isObject2; + module2.exports = isObject3; } }); @@ -109145,13 +109145,13 @@ var require_isObject = __commonJS({ var require_isFunction = __commonJS({ "node_modules/lodash/isFunction.js"(exports2, module2) { var baseGetTag = require_baseGetTag(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var asyncTag = "[object AsyncFunction]"; var funcTag = "[object Function]"; var genTag = "[object GeneratorFunction]"; var proxyTag = "[object Proxy]"; function isFunction(value) { - if (!isObject2(value)) { + if (!isObject3(value)) { return false; } var tag = baseGetTag(value); @@ -109212,7 +109212,7 @@ var require_baseIsNative = __commonJS({ "node_modules/lodash/_baseIsNative.js"(exports2, module2) { var isFunction = require_isFunction(); var isMasked = require_isMasked(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var toSource = require_toSource(); var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; var reIsHostCtor = /^\[object .+?Constructor\]$/; @@ -109224,7 +109224,7 @@ var require_baseIsNative = __commonJS({ "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$" ); function baseIsNative(value) { - if (!isObject2(value) || isMasked(value)) { + if (!isObject3(value) || isMasked(value)) { return false; } var pattern = isFunction(value) ? reIsNative : reIsHostCtor; @@ -109392,9 +109392,9 @@ var require_isIterateeCall = __commonJS({ var eq = require_eq2(); var isArrayLike = require_isArrayLike(); var isIndex = require_isIndex(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); function isIterateeCall(value, index, object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return false; } var type2 = typeof index; @@ -109639,13 +109639,13 @@ var require_nativeKeysIn = __commonJS({ // node_modules/lodash/_baseKeysIn.js var require_baseKeysIn = __commonJS({ "node_modules/lodash/_baseKeysIn.js"(exports2, module2) { - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var isPrototype = require_isPrototype(); var nativeKeysIn = require_nativeKeysIn(); var objectProto = Object.prototype; var hasOwnProperty = objectProto.hasOwnProperty; function baseKeysIn(object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return nativeKeysIn(object); } var isProto = isPrototype(object), result = []; @@ -110137,7 +110137,7 @@ var require_event_target_shim = __commonJS({ var CAPTURE = 1; var BUBBLE = 2; var ATTRIBUTE = 3; - function isObject2(x) { + function isObject3(x) { return x !== null && typeof x === "object"; } function getListeners(eventTarget) { @@ -110163,7 +110163,7 @@ var require_event_target_shim = __commonJS({ return null; }, set(listener) { - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { listener = null; } const listeners = getListeners(this); @@ -110254,11 +110254,11 @@ var require_event_target_shim = __commonJS({ if (listener == null) { return; } - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { throw new TypeError("'listener' should be a function or an object."); } const listeners = getListeners(this); - const optionsIsObj = isObject2(options); + const optionsIsObj = isObject3(options); const capture = optionsIsObj ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; const newNode = { @@ -110295,7 +110295,7 @@ var require_event_target_shim = __commonJS({ return; } const listeners = getListeners(this); - const capture = isObject2(options) ? Boolean(options.capture) : Boolean(options); + const capture = isObject3(options) ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; let prev = null; let node = listeners.get(eventName); @@ -161103,6 +161103,11 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -163247,7 +163252,7 @@ function getArtifactSuffix(matrix) { if (matrix) { try { const matrixObject = JSON.parse(matrix); - if (matrixObject !== null && typeof matrixObject === "object") { + if (isObject2(matrixObject)) { for (const matrixKey of Object.keys(matrixObject).sort()) suffix += `-${matrixObject[matrixKey]}`; } else { diff --git a/lib/analyze-action.js b/lib/analyze-action.js index a65d7175c..ae669f1cc 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url2.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -105897,6 +105897,16 @@ var safeDump = renamed("safeDump", "dump"); // src/util.ts var semver = __toESM(require_semver2()); + +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + +// src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -106181,7 +106191,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -112259,7 +112269,7 @@ function locationUpdateCallback(result, location, logger) { } function resolveUriToFile(location, artifacts, sourceRoot, logger) { if (!location.uri && location.index !== void 0) { - if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || typeof artifacts[location.index].location !== "object") { + if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || !isObject2(artifacts[location.index].location)) { logger.debug(`Ignoring location as index "${location.index}" is invalid`); return void 0; } diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index acd1b250e..c128d3f06 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -102995,6 +102995,14 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -103102,7 +103110,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 479129b24..ed81e8072 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url2.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -107072,10 +107072,10 @@ var require_util20 = __commonJS({ return typeof arg === "number"; } exports2.isNumber = isNumber; - function isString(arg) { + function isString2(arg) { return typeof arg === "string"; } - exports2.isString = isString; + exports2.isString = isString2; function isSymbol(arg) { return typeof arg === "symbol"; } @@ -107088,10 +107088,10 @@ var require_util20 = __commonJS({ return objectToString(re) === "[object RegExp]"; } exports2.isRegExp = isRegExp; - function isObject2(arg) { + function isObject3(arg) { return typeof arg === "object" && arg !== null; } - exports2.isObject = isObject2; + exports2.isObject = isObject3; function isDate(d) { return objectToString(d) === "[object Date]"; } @@ -109133,11 +109133,11 @@ var require_baseGetTag = __commonJS({ // node_modules/lodash/isObject.js var require_isObject = __commonJS({ "node_modules/lodash/isObject.js"(exports2, module2) { - function isObject2(value) { + function isObject3(value) { var type2 = typeof value; return value != null && (type2 == "object" || type2 == "function"); } - module2.exports = isObject2; + module2.exports = isObject3; } }); @@ -109145,13 +109145,13 @@ var require_isObject = __commonJS({ var require_isFunction = __commonJS({ "node_modules/lodash/isFunction.js"(exports2, module2) { var baseGetTag = require_baseGetTag(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var asyncTag = "[object AsyncFunction]"; var funcTag = "[object Function]"; var genTag = "[object GeneratorFunction]"; var proxyTag = "[object Proxy]"; function isFunction(value) { - if (!isObject2(value)) { + if (!isObject3(value)) { return false; } var tag = baseGetTag(value); @@ -109212,7 +109212,7 @@ var require_baseIsNative = __commonJS({ "node_modules/lodash/_baseIsNative.js"(exports2, module2) { var isFunction = require_isFunction(); var isMasked = require_isMasked(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var toSource = require_toSource(); var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; var reIsHostCtor = /^\[object .+?Constructor\]$/; @@ -109224,7 +109224,7 @@ var require_baseIsNative = __commonJS({ "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$" ); function baseIsNative(value) { - if (!isObject2(value) || isMasked(value)) { + if (!isObject3(value) || isMasked(value)) { return false; } var pattern = isFunction(value) ? reIsNative : reIsHostCtor; @@ -109392,9 +109392,9 @@ var require_isIterateeCall = __commonJS({ var eq = require_eq2(); var isArrayLike = require_isArrayLike(); var isIndex = require_isIndex(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); function isIterateeCall(value, index, object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return false; } var type2 = typeof index; @@ -109639,13 +109639,13 @@ var require_nativeKeysIn = __commonJS({ // node_modules/lodash/_baseKeysIn.js var require_baseKeysIn = __commonJS({ "node_modules/lodash/_baseKeysIn.js"(exports2, module2) { - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var isPrototype = require_isPrototype(); var nativeKeysIn = require_nativeKeysIn(); var objectProto = Object.prototype; var hasOwnProperty = objectProto.hasOwnProperty; function baseKeysIn(object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return nativeKeysIn(object); } var isProto = isPrototype(object), result = []; @@ -110137,7 +110137,7 @@ var require_event_target_shim = __commonJS({ var CAPTURE = 1; var BUBBLE = 2; var ATTRIBUTE = 3; - function isObject2(x) { + function isObject3(x) { return x !== null && typeof x === "object"; } function getListeners(eventTarget) { @@ -110163,7 +110163,7 @@ var require_event_target_shim = __commonJS({ return null; }, set(listener) { - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { listener = null; } const listeners = getListeners(this); @@ -110254,11 +110254,11 @@ var require_event_target_shim = __commonJS({ if (listener == null) { return; } - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { throw new TypeError("'listener' should be a function or an object."); } const listeners = getListeners(this); - const optionsIsObj = isObject2(options); + const optionsIsObj = isObject3(options); const capture = optionsIsObj ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; const newNode = { @@ -110295,7 +110295,7 @@ var require_event_target_shim = __commonJS({ return; } const listeners = getListeners(this); - const capture = isObject2(options) ? Boolean(options.capture) : Boolean(options); + const capture = isObject3(options) ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; let prev = null; let node = listeners.get(eventName); @@ -164001,6 +164001,14 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; @@ -164111,7 +164119,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -168209,7 +168217,7 @@ function getArtifactSuffix(matrix) { if (matrix) { try { const matrixObject = JSON.parse(matrix); - if (matrixObject !== null && typeof matrixObject === "object") { + if (isObject2(matrixObject)) { for (const matrixKey of Object.keys(matrixObject).sort()) suffix += `-${matrixObject[matrixKey]}`; } else { @@ -169349,7 +169357,7 @@ function locationUpdateCallback(result, location, logger) { } function resolveUriToFile(location, artifacts, sourceRoot, logger) { if (!location.uri && location.index !== void 0) { - if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || typeof artifacts[location.index].location !== "object") { + if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || !isObject2(artifacts[location.index].location)) { logger.debug(`Ignoring location as index "${location.index}" is invalid`); return void 0; } diff --git a/lib/init-action.js b/lib/init-action.js index 5d5a6fa59..88438c956 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -53545,8 +53545,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -58032,7 +58032,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -58079,7 +58079,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -100091,7 +100091,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString2(data) && !isBuffer(data)) { + if (!isString3(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100346,7 +100346,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString2(input)) { + } else if (isString3(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100362,7 +100362,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString2(options.host) && !isString2(options.hostname)) { + if (!isString3(options.host) && !isString3(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100389,7 +100389,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString2(parsed.protocol)) { + if (!isString3(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100461,11 +100461,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString2(subdomain) && isString2(domain)); + assert(isString3(subdomain) && isString3(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString2(value) { + function isString3(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -103214,6 +103214,14 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; @@ -103527,7 +103535,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -104408,16 +104416,16 @@ var RepositoryPropertyName = /* @__PURE__ */ ((RepositoryPropertyName2) => { RepositoryPropertyName2["EXTRA_QUERIES"] = "github-codeql-extra-queries"; return RepositoryPropertyName2; })(RepositoryPropertyName || {}); -function isString(value) { +function isString2(value) { return typeof value === "string"; } var stringProperty = { - validate: isString, + validate: isString2, parse: parseStringRepositoryProperty }; var booleanProperty = { // The value from the API should come as a string, which we then parse into a boolean. - validate: isString, + validate: isString2, parse: parseBooleanRepositoryProperty }; var repositoryPropertyParsers = { @@ -106027,7 +106035,7 @@ async function getOverlayStatus(codeql, languages, diskUsage, logger) { } const contents = await fs5.promises.readFile(statusFile, "utf-8"); const parsed = JSON.parse(contents); - if (typeof parsed !== "object" || parsed === null || typeof parsed["attemptedToBuildOverlayBaseDatabase"] !== "boolean" || typeof parsed["builtOverlayBaseDatabase"] !== "boolean") { + if (!isObject2(parsed) || typeof parsed["attemptedToBuildOverlayBaseDatabase"] !== "boolean" || typeof parsed["builtOverlayBaseDatabase"] !== "boolean") { logger.debug( "Ignoring overlay status cache entry with unexpected format." ); diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index aa3673bd3..21c48713c 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -102995,6 +102995,14 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -103095,7 +103103,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index a9eb08eb5..f0d2b2a50 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -52097,8 +52097,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -56584,7 +56584,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -56631,7 +56631,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -103051,6 +103051,14 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + // src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; @@ -103168,7 +103176,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 6fdfe2d8b..19177d969 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID() { @@ -105699,10 +105699,10 @@ var require_util20 = __commonJS({ return typeof arg === "number"; } exports2.isNumber = isNumber; - function isString(arg) { + function isString2(arg) { return typeof arg === "string"; } - exports2.isString = isString; + exports2.isString = isString2; function isSymbol(arg) { return typeof arg === "symbol"; } @@ -105715,10 +105715,10 @@ var require_util20 = __commonJS({ return objectToString(re) === "[object RegExp]"; } exports2.isRegExp = isRegExp; - function isObject2(arg) { + function isObject3(arg) { return typeof arg === "object" && arg !== null; } - exports2.isObject = isObject2; + exports2.isObject = isObject3; function isDate(d) { return objectToString(d) === "[object Date]"; } @@ -107760,11 +107760,11 @@ var require_baseGetTag = __commonJS({ // node_modules/lodash/isObject.js var require_isObject = __commonJS({ "node_modules/lodash/isObject.js"(exports2, module2) { - function isObject2(value) { + function isObject3(value) { var type2 = typeof value; return value != null && (type2 == "object" || type2 == "function"); } - module2.exports = isObject2; + module2.exports = isObject3; } }); @@ -107772,13 +107772,13 @@ var require_isObject = __commonJS({ var require_isFunction = __commonJS({ "node_modules/lodash/isFunction.js"(exports2, module2) { var baseGetTag = require_baseGetTag(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var asyncTag = "[object AsyncFunction]"; var funcTag = "[object Function]"; var genTag = "[object GeneratorFunction]"; var proxyTag = "[object Proxy]"; function isFunction(value) { - if (!isObject2(value)) { + if (!isObject3(value)) { return false; } var tag = baseGetTag(value); @@ -107839,7 +107839,7 @@ var require_baseIsNative = __commonJS({ "node_modules/lodash/_baseIsNative.js"(exports2, module2) { var isFunction = require_isFunction(); var isMasked = require_isMasked(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var toSource = require_toSource(); var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; var reIsHostCtor = /^\[object .+?Constructor\]$/; @@ -107851,7 +107851,7 @@ var require_baseIsNative = __commonJS({ "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$" ); function baseIsNative(value) { - if (!isObject2(value) || isMasked(value)) { + if (!isObject3(value) || isMasked(value)) { return false; } var pattern = isFunction(value) ? reIsNative : reIsHostCtor; @@ -108019,9 +108019,9 @@ var require_isIterateeCall = __commonJS({ var eq = require_eq2(); var isArrayLike = require_isArrayLike(); var isIndex = require_isIndex(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); function isIterateeCall(value, index, object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return false; } var type2 = typeof index; @@ -108266,13 +108266,13 @@ var require_nativeKeysIn = __commonJS({ // node_modules/lodash/_baseKeysIn.js var require_baseKeysIn = __commonJS({ "node_modules/lodash/_baseKeysIn.js"(exports2, module2) { - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var isPrototype = require_isPrototype(); var nativeKeysIn = require_nativeKeysIn(); var objectProto = Object.prototype; var hasOwnProperty = objectProto.hasOwnProperty; function baseKeysIn(object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return nativeKeysIn(object); } var isProto = isPrototype(object), result = []; @@ -108764,7 +108764,7 @@ var require_event_target_shim = __commonJS({ var CAPTURE = 1; var BUBBLE = 2; var ATTRIBUTE = 3; - function isObject2(x) { + function isObject3(x) { return x !== null && typeof x === "object"; } function getListeners(eventTarget) { @@ -108790,7 +108790,7 @@ var require_event_target_shim = __commonJS({ return null; }, set(listener) { - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { listener = null; } const listeners = getListeners(this); @@ -108881,11 +108881,11 @@ var require_event_target_shim = __commonJS({ if (listener == null) { return; } - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { throw new TypeError("'listener' should be a function or an object."); } const listeners = getListeners(this); - const optionsIsObj = isObject2(options); + const optionsIsObj = isObject3(options); const capture = optionsIsObj ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; const newNode = { @@ -108922,7 +108922,7 @@ var require_event_target_shim = __commonJS({ return; } const listeners = getListeners(this); - const capture = isObject2(options) ? Boolean(options.capture) : Boolean(options); + const capture = isObject3(options) ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; let prev = null; let node = listeners.get(eventName); @@ -158048,7 +158048,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -158303,7 +158303,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -158319,7 +158319,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -158346,7 +158346,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -158418,11 +158418,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -161100,6 +161100,11 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + // src/util.ts var GITHUB_DOTCOM_URL = "https://github.com"; var MINIMUM_CGROUP_MEMORY_LIMIT_BYTES = 1024 * 1024; @@ -162147,7 +162152,7 @@ function getArtifactSuffix(matrix) { if (matrix) { try { const matrixObject = JSON.parse(matrix); - if (matrixObject !== null && typeof matrixObject === "object") { + if (isObject2(matrixObject)) { for (const matrixKey of Object.keys(matrixObject).sort()) suffix += `-${matrixObject[matrixKey]}`; } else { diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 79679c358..b8f5ebfd1 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -120223,6 +120223,25 @@ var safeDump = renamed("safeDump", "dump"); // src/util.ts var semver = __toESM(require_semver2()); + +// src/json/index.ts +function parseString(data) { + return JSON.parse(data); +} +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isArray(value) { + return Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} +function isStringOrUndefined(value) { + return value === void 0 || isString(value); +} + +// src/util.ts var GITHUB_DOTCOM_URL = "https://github.com"; var MINIMUM_CGROUP_MEMORY_LIMIT_BYTES = 1024 * 1024; function parseGitHubUrl(inputUrl) { @@ -120270,7 +120289,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -121350,23 +121369,6 @@ function isAuthToken(value, patterns = GITHUB_TOKEN_PATTERNS) { return void 0; } -// src/json/index.ts -function parseString(data) { - return JSON.parse(data); -} -function isObject2(value) { - return typeof value === "object"; -} -function isArray(value) { - return Array.isArray(value); -} -function isString(value) { - return typeof value === "string"; -} -function isStringOrUndefined(value) { - return value === void 0 || isString(value); -} - // src/languages.ts var KnownLanguage = /* @__PURE__ */ ((KnownLanguage2) => { KnownLanguage2["actions"] = "actions"; @@ -121390,6 +121392,9 @@ function isUsernamePassword(config) { return hasUsername(config) && "password" in config; } function isToken(config) { + if ("username" in config && !isStringOrUndefined(config.username)) { + return false; + } return "token" in config && isStringOrUndefined(config.token); } function isAzureConfig(config) { diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 2f5585bd1..6ac4389d5 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -53394,8 +53394,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -57881,7 +57881,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -57928,7 +57928,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url2.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -105913,6 +105913,16 @@ var safeDump = renamed("safeDump", "dump"); // src/util.ts var semver = __toESM(require_semver2()); + +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + +// src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -105996,7 +106006,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -110146,7 +110156,7 @@ function locationUpdateCallback(result, location, logger) { } function resolveUriToFile(location, artifacts, sourceRoot, logger) { if (!location.uri && location.index !== void 0) { - if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || typeof artifacts[location.index].location !== "object") { + if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || !isObject2(artifacts[location.index].location)) { logger.debug(`Ignoring location as index "${location.index}" is invalid`); return void 0; } diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index dab78eb86..de2611d86 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -55607,8 +55607,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -60094,7 +60094,7 @@ var require_commonjs6 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -60141,7 +60141,7 @@ var require_commonjs6 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID() { @@ -97883,10 +97883,10 @@ var require_util19 = __commonJS({ return typeof arg === "number"; } exports2.isNumber = isNumber; - function isString(arg) { + function isString2(arg) { return typeof arg === "string"; } - exports2.isString = isString; + exports2.isString = isString2; function isSymbol(arg) { return typeof arg === "symbol"; } @@ -97899,10 +97899,10 @@ var require_util19 = __commonJS({ return objectToString(re) === "[object RegExp]"; } exports2.isRegExp = isRegExp; - function isObject2(arg) { + function isObject3(arg) { return typeof arg === "object" && arg !== null; } - exports2.isObject = isObject2; + exports2.isObject = isObject3; function isDate(d) { return objectToString(d) === "[object Date]"; } @@ -99944,11 +99944,11 @@ var require_baseGetTag = __commonJS({ // node_modules/lodash/isObject.js var require_isObject = __commonJS({ "node_modules/lodash/isObject.js"(exports2, module2) { - function isObject2(value) { + function isObject3(value) { var type2 = typeof value; return value != null && (type2 == "object" || type2 == "function"); } - module2.exports = isObject2; + module2.exports = isObject3; } }); @@ -99956,13 +99956,13 @@ var require_isObject = __commonJS({ var require_isFunction = __commonJS({ "node_modules/lodash/isFunction.js"(exports2, module2) { var baseGetTag = require_baseGetTag(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var asyncTag = "[object AsyncFunction]"; var funcTag = "[object Function]"; var genTag = "[object GeneratorFunction]"; var proxyTag = "[object Proxy]"; function isFunction(value) { - if (!isObject2(value)) { + if (!isObject3(value)) { return false; } var tag = baseGetTag(value); @@ -100023,7 +100023,7 @@ var require_baseIsNative = __commonJS({ "node_modules/lodash/_baseIsNative.js"(exports2, module2) { var isFunction = require_isFunction(); var isMasked = require_isMasked(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var toSource = require_toSource(); var reRegExpChar = /[\\^$.*+?()[\]{}|]/g; var reIsHostCtor = /^\[object .+?Constructor\]$/; @@ -100035,7 +100035,7 @@ var require_baseIsNative = __commonJS({ "^" + funcToString.call(hasOwnProperty).replace(reRegExpChar, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$" ); function baseIsNative(value) { - if (!isObject2(value) || isMasked(value)) { + if (!isObject3(value) || isMasked(value)) { return false; } var pattern = isFunction(value) ? reIsNative : reIsHostCtor; @@ -100203,9 +100203,9 @@ var require_isIterateeCall = __commonJS({ var eq = require_eq2(); var isArrayLike = require_isArrayLike(); var isIndex = require_isIndex(); - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); function isIterateeCall(value, index, object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return false; } var type2 = typeof index; @@ -100450,13 +100450,13 @@ var require_nativeKeysIn = __commonJS({ // node_modules/lodash/_baseKeysIn.js var require_baseKeysIn = __commonJS({ "node_modules/lodash/_baseKeysIn.js"(exports2, module2) { - var isObject2 = require_isObject(); + var isObject3 = require_isObject(); var isPrototype = require_isPrototype(); var nativeKeysIn = require_nativeKeysIn(); var objectProto = Object.prototype; var hasOwnProperty = objectProto.hasOwnProperty; function baseKeysIn(object) { - if (!isObject2(object)) { + if (!isObject3(object)) { return nativeKeysIn(object); } var isProto = isPrototype(object), result = []; @@ -100948,7 +100948,7 @@ var require_event_target_shim = __commonJS({ var CAPTURE = 1; var BUBBLE = 2; var ATTRIBUTE = 3; - function isObject2(x) { + function isObject3(x) { return x !== null && typeof x === "object"; } function getListeners(eventTarget) { @@ -100974,7 +100974,7 @@ var require_event_target_shim = __commonJS({ return null; }, set(listener) { - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { listener = null; } const listeners = getListeners(this); @@ -101065,11 +101065,11 @@ var require_event_target_shim = __commonJS({ if (listener == null) { return; } - if (typeof listener !== "function" && !isObject2(listener)) { + if (typeof listener !== "function" && !isObject3(listener)) { throw new TypeError("'listener' should be a function or an object."); } const listeners = getListeners(this); - const optionsIsObj = isObject2(options); + const optionsIsObj = isObject3(options); const capture = optionsIsObj ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; const newNode = { @@ -101106,7 +101106,7 @@ var require_event_target_shim = __commonJS({ return; } const listeners = getListeners(this); - const capture = isObject2(options) ? Boolean(options.capture) : Boolean(options); + const capture = isObject3(options) ? Boolean(options.capture) : Boolean(options); const listenerType = capture ? CAPTURE : BUBBLE; let prev = null; let node = listeners.get(eventName); @@ -158048,7 +158048,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -158303,7 +158303,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -158319,7 +158319,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -158346,7 +158346,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -158418,11 +158418,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -161100,6 +161100,11 @@ var semver = __toESM(require_semver2()); var maximumVersion = "3.21"; var minimumVersion = "3.14"; +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + // src/util.ts var GITHUB_DOTCOM_URL = "https://github.com"; var MINIMUM_CGROUP_MEMORY_LIMIT_BYTES = 1024 * 1024; @@ -162169,7 +162174,7 @@ function getArtifactSuffix(matrix) { if (matrix) { try { const matrixObject = JSON.parse(matrix); - if (matrixObject !== null && typeof matrixObject === "object") { + if (isObject2(matrixObject)) { for (const matrixKey of Object.keys(matrixObject).sort()) suffix += `-${matrixObject[matrixKey]}`; } else { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 53f385653..a2a8cb1d7 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -52097,8 +52097,8 @@ var require_object = __commonJS({ "node_modules/@typespec/ts-http-runtime/dist/commonjs/util/object.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); - exports2.isObject = isObject2; - function isObject2(input) { + exports2.isObject = isObject3; + function isObject3(input) { return typeof input === "object" && input !== null && !Array.isArray(input) && !(input instanceof RegExp) && !(input instanceof Date); } } @@ -56584,7 +56584,7 @@ var require_commonjs4 = __commonJS({ exports2.computeSha256Hmac = computeSha256Hmac; exports2.getRandomIntegerInclusive = getRandomIntegerInclusive; exports2.isError = isError; - exports2.isObject = isObject2; + exports2.isObject = isObject3; exports2.randomUUID = randomUUID2; exports2.uint8ArrayToString = uint8ArrayToString; exports2.stringToUint8Array = stringToUint8Array; @@ -56631,7 +56631,7 @@ var require_commonjs4 = __commonJS({ function isError(e) { return tspRuntime.isError(e); } - function isObject2(input) { + function isObject3(input) { return tspRuntime.isObject(input); } function randomUUID2() { @@ -99940,7 +99940,7 @@ var require_follow_redirects = __commonJS({ if (this._ending) { throw new WriteAfterEndError(); } - if (!isString(data) && !isBuffer(data)) { + if (!isString2(data) && !isBuffer(data)) { throw new TypeError("data should be a string, Buffer or Uint8Array"); } if (isFunction(encoding)) { @@ -100195,7 +100195,7 @@ var require_follow_redirects = __commonJS({ function request2(input, options, callback) { if (isURL(input)) { input = spreadUrlObject(input); - } else if (isString(input)) { + } else if (isString2(input)) { input = spreadUrlObject(parseUrl2(input)); } else { callback = options; @@ -100211,7 +100211,7 @@ var require_follow_redirects = __commonJS({ maxBodyLength: exports3.maxBodyLength }, input, options); options.nativeProtocols = nativeProtocols; - if (!isString(options.host) && !isString(options.hostname)) { + if (!isString2(options.host) && !isString2(options.hostname)) { options.hostname = "::1"; } assert.equal(options.protocol, protocol, "protocol mismatch"); @@ -100238,7 +100238,7 @@ var require_follow_redirects = __commonJS({ parsed = new URL2(input); } else { parsed = validateUrl(url2.parse(input)); - if (!isString(parsed.protocol)) { + if (!isString2(parsed.protocol)) { throw new InvalidUrlError({ input }); } } @@ -100310,11 +100310,11 @@ var require_follow_redirects = __commonJS({ request2.destroy(error3); } function isSubdomain(subdomain, domain) { - assert(isString(subdomain) && isString(domain)); + assert(isString2(subdomain) && isString2(domain)); var dot = subdomain.length - domain.length - 1; return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain); } - function isString(value) { + function isString2(value) { return typeof value === "string" || value instanceof String; } function isFunction(value) { @@ -105888,6 +105888,16 @@ var safeDump = renamed("safeDump", "dump"); // src/util.ts var semver = __toESM(require_semver2()); + +// src/json/index.ts +function isObject2(value) { + return typeof value === "object" && value !== null && !Array.isArray(value); +} +function isString(value) { + return typeof value === "string"; +} + +// src/util.ts var BASE_DATABASE_OIDS_FILE_NAME = "base-database-oids.json"; var BROKEN_VERSIONS = ["0.0.0-20211207"]; var GITHUB_DOTCOM_URL = "https://github.com"; @@ -105978,7 +105988,7 @@ var HTTPError = class extends Error { var ConfigurationError = class extends Error { }; function asHTTPError(arg) { - if (typeof arg !== "object" || arg === null || typeof arg.message !== "string") { + if (!isObject2(arg) || !isString(arg.message)) { return void 0; } if (Number.isInteger(arg.status)) { @@ -110809,7 +110819,7 @@ function locationUpdateCallback(result, location, logger) { } function resolveUriToFile(location, artifacts, sourceRoot, logger) { if (!location.uri && location.index !== void 0) { - if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || typeof artifacts[location.index].location !== "object") { + if (typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || !isObject2(artifacts[location.index].location)) { logger.debug(`Ignoring location as index "${location.index}" is invalid`); return void 0; } diff --git a/src/debug-artifacts.ts b/src/debug-artifacts.ts index aea5af01f..ec6940500 100644 --- a/src/debug-artifacts.ts +++ b/src/debug-artifacts.ts @@ -12,6 +12,7 @@ import { scanArtifactsForTokens } from "./artifact-scanner"; import { type CodeQL } from "./codeql"; import { Config } from "./config-utils"; import { EnvVar } from "./environment"; +import * as json from "./json"; import { Language } from "./languages"; import { Logger, withGroup } from "./logging"; import { @@ -261,7 +262,7 @@ export function getArtifactSuffix(matrix: string | undefined): string { if (matrix) { try { const matrixObject = JSON.parse(matrix); - if (matrixObject !== null && typeof matrixObject === "object") { + if (json.isObject(matrixObject)) { for (const matrixKey of Object.keys(matrixObject as object).sort()) suffix += `-${matrixObject[matrixKey]}`; } else { diff --git a/src/fingerprints.ts b/src/fingerprints.ts index 013ba65f5..14cf30e63 100644 --- a/src/fingerprints.ts +++ b/src/fingerprints.ts @@ -4,6 +4,7 @@ import path from "path"; import Long from "long"; import { DocUrl } from "./doc-url"; +import * as json from "./json"; import { Logger } from "./logging"; import type * as sarif from "./sarif"; @@ -189,7 +190,7 @@ export function resolveUriToFile( typeof location.index !== "number" || location.index < 0 || location.index >= artifacts.length || - typeof artifacts[location.index].location !== "object" + !json.isObject(artifacts[location.index].location) ) { logger.debug(`Ignoring location as index "${location.index}" is invalid`); return undefined; diff --git a/src/json/index.ts b/src/json/index.ts index d6a1bfd1c..f3d212ebe 100644 --- a/src/json/index.ts +++ b/src/json/index.ts @@ -17,7 +17,7 @@ export function parseString(data: string): unknown { /** Asserts that `value` is an object, which is not yet validated, but expected to be of type `T`. */ export function isObject(value: unknown): value is UnvalidatedObject { - return typeof value === "object"; + return typeof value === "object" && value !== null && !Array.isArray(value); } /** Asserts that `value` is an array, which is not yet validated. */ diff --git a/src/overlay/status.ts b/src/overlay/status.ts index a57835ed1..3acf38296 100644 --- a/src/overlay/status.ts +++ b/src/overlay/status.ts @@ -19,6 +19,7 @@ import { getWorkflowRunID, } from "../actions-util"; import { type CodeQL } from "../codeql"; +import * as json from "../json"; import { Logger } from "../logging"; import { DiskUsage, @@ -149,8 +150,7 @@ export async function getOverlayStatus( const contents = await fs.promises.readFile(statusFile, "utf-8"); const parsed: unknown = JSON.parse(contents); if ( - typeof parsed !== "object" || - parsed === null || + !json.isObject(parsed) || typeof parsed["attemptedToBuildOverlayBaseDatabase"] !== "boolean" || typeof parsed["builtOverlayBaseDatabase"] !== "boolean" ) { diff --git a/src/start-proxy.ts b/src/start-proxy.ts index 6b55cbe45..32762eae3 100644 --- a/src/start-proxy.ts +++ b/src/start-proxy.ts @@ -323,7 +323,7 @@ export function getAuthConfig( // There are three scenarios for non-OIDC authentication based on the registry type: // // 1. `username`+`token` - // 2. A `token` that combines the username and actual token, seperated by ':'. + // 2. A `token` that combines the username and actual token, separated by ':'. // 3. `username`+`password` // // In all three cases, all fields are optional. If the `token` field is present, diff --git a/src/start-proxy/types.ts b/src/start-proxy/types.ts index f3e4db364..0d3bf86c5 100644 --- a/src/start-proxy/types.ts +++ b/src/start-proxy/types.ts @@ -49,6 +49,12 @@ export type Token = { export function isToken( config: UnvalidatedObject, ): config is Token { + // The "username" field is optional, but should be a string if present. + if ("username" in config && !json.isStringOrUndefined(config.username)) { + return false; + } + + // The "token" field is required, and must be a string or undefined. return "token" in config && json.isStringOrUndefined(config.token); } @@ -121,7 +127,7 @@ export type JFrogConfig = { export function isJFrogConfig( config: UnvalidatedObject, ): config is JFrogConfig { - // The "audience" and "identity_mapping_name" fields is optional, but should be strings if present. + // The "audience" and "identity_mapping_name" fields are optional, but should be strings if present. if ("audience" in config && !json.isStringOrUndefined(config.audience)) { return false; } diff --git a/src/util.ts b/src/util.ts index 6db56e722..e2331461b 100644 --- a/src/util.ts +++ b/src/util.ts @@ -14,6 +14,7 @@ import type { CodeQL, VersionInfo } from "./codeql"; import type { Pack } from "./config/db-config"; import type { Config } from "./config-utils"; import { EnvVar } from "./environment"; +import * as json from "./json"; import { Language } from "./languages"; import { Logger } from "./logging"; @@ -603,19 +604,15 @@ export class HTTPError extends Error { export class ConfigurationError extends Error {} export function asHTTPError(arg: any): HTTPError | undefined { - if ( - typeof arg !== "object" || - arg === null || - typeof arg.message !== "string" - ) { + if (!json.isObject(arg) || !json.isString(arg.message)) { return undefined; } if (Number.isInteger(arg.status)) { - return new HTTPError(arg.message as string, arg.status as number); + return new HTTPError(arg.message, arg.status as number); } // See https://github.com/actions/toolkit/blob/acb230b99a46ed33a3f04a758cd68b47b9a82908/packages/tool-cache/src/tool-cache.ts#L19 if (Number.isInteger(arg.httpStatusCode)) { - return new HTTPError(arg.message as string, arg.httpStatusCode as number); + return new HTTPError(arg.message, arg.httpStatusCode as number); } return undefined; }