1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

more type fixing

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-05-12 16:23:37 -04:00
parent 2ce46f67de
commit e73dc03031

View File

@ -2,6 +2,7 @@
* Copyright (c) OpenLens Authors. All rights reserved. * Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import assert from "assert";
import semver, { type SemVer } from "semver"; import semver, { type SemVer } from "semver";
import type { LensExtensionManifest } from "../../lens-extension"; import type { LensExtensionManifest } from "../../lens-extension";
@ -13,9 +14,12 @@ export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest:
return (manifest: LensExtensionManifest): boolean => { return (manifest: LensExtensionManifest): boolean => {
const appVersion = appSemVer.raw.split("-")[0]; // drop prerelease version if any, e.g. "-alpha.0" const appVersion = appSemVer.raw.split("-")[0]; // drop prerelease version if any, e.g. "-alpha.0"
const manifestLensEngine = manifest.engines.lens; const manifestLensEngine = manifest.engines.lens;
const validVersion = manifestLensEngine.match(/^[\^0-9]\d*\.\d+\b/); // must start from ^ or number const lensEngine = semver.coerce(manifestLensEngine, {
loose: true,
includePrerelease: false,
});
if (!validVersion) { if (!lensEngine) {
const errorInfo = [ const errorInfo = [
`Invalid format for "manifest.engines.lens"="${manifestLensEngine}"`, `Invalid format for "manifest.engines.lens"="${manifestLensEngine}"`,
`Range versions can only be specified starting with '^'.`, `Range versions can only be specified starting with '^'.`,
@ -25,11 +29,11 @@ export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest:
throw new Error(errorInfo); throw new Error(errorInfo);
} }
const { major: extMajor, minor: extMinor } = semver.coerce(manifestLensEngine, { const { major: extMajor, minor: extMinor } = lensEngine;
loose: true, const supportedRange = `^${extMajor}.${extMinor}`;
includePrerelease: false, const supportedVersionsByExtension = semver.validRange(supportedRange);
});
const supportedVersionsByExtension: string = semver.validRange(`^${extMajor}.${extMinor}`); assert(supportedVersionsByExtension, `${supportedRange} should always be a valid semver range`);
return semver.satisfies(appVersion, supportedVersionsByExtension, { return semver.satisfies(appVersion, supportedVersionsByExtension, {
loose: true, loose: true,