metar-taf-parser 8.0.2 → 8.0.4

package/metar-taf-parser.d.ts

@@ -754,10 +754,10 @@ declare const _default: {
     };
 };
 
-type DeepPartial<T> = T extends object ? {
+declare type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
-type Locale = DeepPartial<typeof _default>;
+declare type Locale = DeepPartial<typeof _default>;
 
 interface ICeilingHeightRemark extends IBaseRemark {
     type: RemarkType.CeilingHeight;
@@ -1051,7 +1051,7 @@ interface IWindShiftFropaRemark extends IBaseRemark {
     startMinute: number;
 }
 
-type DefaultRemarkTypes = RemarkType.AO1 | RemarkType.AO2 | RemarkType.PRESFR | RemarkType.PRESRR | RemarkType.TORNADO | RemarkType.FUNNELCLOUD | RemarkType.WATERSPOUT | RemarkType.VIRGA;
+declare type DefaultRemarkTypes = RemarkType.AO1 | RemarkType.AO2 | RemarkType.PRESFR | RemarkType.PRESRR | RemarkType.TORNADO | RemarkType.FUNNELCLOUD | RemarkType.WATERSPOUT | RemarkType.VIRGA;
 interface IDefaultCommandRemark extends IBaseRemark {
     type: DefaultRemarkTypes;
 }
@@ -1130,7 +1130,7 @@ declare enum RemarkType {
     SunshineDuration = "SunshineDuration",
     WaterEquivalentSnow = "WaterEquivalentSnow"
 }
-type Remark = IUnknownRemark | IDefaultCommandRemark | ICeilingHeightRemark | ICeilingSecondLocationRemark | IHailSizeRemark | IHourlyMaximumMinimumTemperatureRemark | IHourlyMaximumTemperatureRemark | IHourlyMinimumTemperatureRemark | IHourlyPrecipitationAmountRemark | IHourlyPressureRemark | IHourlyTemperatureDewPointRemark | IIceAccretionRemark | IObscurationRemark | IPrecipitationAmount24HourRemark | IPrecipitationAmount36HourRemark | IPrecipitationAmount36HourRemark | IPrecipitationBegRemark | IPrecipitationBegEndRemark | IPrecipitationEndRemark | IPrevailingVisibilityRemark | ISeaLevelPressureRemark | ISecondLocationVisibilityRemark | ISectorVisibilityRemark | ISmallHailSizeRemark | ISnowDepthRemark | ISnowIncreaseRemark | ISnowPelletsRemark | ISunshineDurationRemark | ISurfaceVisibilityRemark | IThunderStormLocationRemark | IThunderStormLocationMovingRemark | ITornadicActivityBegRemark | ITornadicActivityBegEndRemark | ITornadicActivityEndRemark | ITowerVisibilityRemark | IVariableSkyRemark | IVariableSkyHeightRemark | IVirgaDirectionRemark | IWaterEquivalentSnowRemark | IWindPeakCommandRemark | IWindShiftRemark | IWindShiftFropaRemark;
+declare type Remark = IUnknownRemark | IDefaultCommandRemark | ICeilingHeightRemark | ICeilingSecondLocationRemark | IHailSizeRemark | IHourlyMaximumMinimumTemperatureRemark | IHourlyMaximumTemperatureRemark | IHourlyMinimumTemperatureRemark | IHourlyPrecipitationAmountRemark | IHourlyPressureRemark | IHourlyTemperatureDewPointRemark | IIceAccretionRemark | IObscurationRemark | IPrecipitationAmount24HourRemark | IPrecipitationAmount36HourRemark | IPrecipitationAmount36HourRemark | IPrecipitationBegRemark | IPrecipitationBegEndRemark | IPrecipitationEndRemark | IPrevailingVisibilityRemark | ISeaLevelPressureRemark | ISecondLocationVisibilityRemark | ISectorVisibilityRemark | ISmallHailSizeRemark | ISnowDepthRemark | ISnowIncreaseRemark | ISnowPelletsRemark | ISunshineDurationRemark | ISurfaceVisibilityRemark | IThunderStormLocationRemark | IThunderStormLocationMovingRemark | ITornadicActivityBegRemark | ITornadicActivityBegEndRemark | ITornadicActivityEndRemark | ITowerVisibilityRemark | IVariableSkyRemark | IVariableSkyHeightRemark | IVirgaDirectionRemark | IWaterEquivalentSnowRemark | IWindPeakCommandRemark | IWindShiftRemark | IWindShiftFropaRemark;
 
 interface IWind {
     speed: number;
@@ -1154,7 +1154,7 @@ interface Distance {
     /** No Directional Visibility */
     ndv?: true;
 }
-type Visibility = Distance & {
+declare type Visibility = Distance & {
     /**
      * Never in North American METARs
      */
@@ -1182,7 +1182,7 @@ interface ITemperature {
 interface ITemperatureDated extends ITemperature {
     date: Date;
 }
-type RunwayInfo = IRunwayInfoRange | IRunwayInfoDeposit;
+declare type RunwayInfo = IRunwayInfoRange | IRunwayInfoDeposit;
 interface IBaseRunwayInfo {
     name: string;
 }
@@ -1376,7 +1376,7 @@ interface IBaseTAFTrend extends IAbstractTrend, ITafGroups {
      */
     validity: IAbstractValidity & Partial<IFMValidity> & Partial<IValidity>;
 }
-type TAFTrend = IBaseTAFTrend & ({
+declare type TAFTrend = IBaseTAFTrend & ({
     type: WeatherChangeType.FM;
     validity: IFMValidity;
 } | {
@@ -1431,7 +1431,7 @@ interface IMetarDated extends IMetar {
     issued: Date;
 }
 
-type TAFTrendDated = IAbstractTrend & IBaseTAFTrend & {
+declare type TAFTrendDated = IAbstractTrend & IBaseTAFTrend & {
     validity: IBaseTAFTrend["validity"] & {
         start: Date;
         end?: Date;
@@ -1498,9 +1498,9 @@ declare class UnexpectedParseError extends ParseError {
  * The initial forecast, extracted from the first line of the TAF, does not have
  * a trend type (FM, BECMG, etc)
  */
-type ForecastWithoutDates = Omit<TAFTrendDated, "type"> & Partial<Pick<TAFTrendDated, "type">>;
-type ForecastWithoutValidity = Omit<ForecastWithoutDates, "validity">;
-type Forecast = Omit<ForecastWithoutValidity, "type"> & {
+declare type ForecastWithoutDates = Omit<TAFTrendDated, "type"> & Partial<Pick<TAFTrendDated, "type">>;
+declare type ForecastWithoutValidity = Omit<ForecastWithoutDates, "validity">;
+declare type Forecast = Omit<ForecastWithoutValidity, "type"> & {
     start: Date;
     end: Date;
 } & ({

package/metar-taf-parser.js

@@ -1916,7 +1916,7 @@ class MainVisibilityCommand {
 _MainVisibilityCommand_regex = new WeakMap();
 class WindCommand {
     constructor() {
-        _WindCommand_regex.set(this, /^(VRB|00|[0-3]\d{2})(\d{2})G?(\d{2})?(KT|MPS|KM\/H)?/);
+        _WindCommand_regex.set(this, /^(VRB|00|[0-3]\d{2})(\d{2})G?(\d{2,3})?(KT|MPS|KM\/H)?/);
     }
     canParse(windString) {
         return __classPrivateFieldGet(this, _WindCommand_regex, "f").test(windString);
@@ -1958,7 +1958,7 @@ class WindVariationCommand {
 _WindVariationCommand_regex = new WeakMap();
 class WindShearCommand {
     constructor() {
-        _WindShearCommand_regex.set(this, /^WS(\d{3})\/(\w{3})(\d{2})G?(\d{2})?(KT|MPS|KM\/H)/);
+        _WindShearCommand_regex.set(this, /^WS(\d{3})\/(\w{3})(\d{2})G?(\d{2,3})?(KT|MPS|KM\/H)/);
     }
     canParse(windString) {
         return __classPrivateFieldGet(this, _WindShearCommand_regex, "f").test(windString);
@@ -3069,8 +3069,8 @@ class TimestampOutOfBoundsError extends ParseError {
 }
 function getCompositeForecastForDate(date, forecastContainer) {
     // Validity bounds check
-    if (date.getTime() > forecastContainer.end.getTime() ||
-        date.getTime() < forecastContainer.start.getTime())
+    if (date.getTime() < forecastContainer.start.getTime() ||
+        date.getTime() >= forecastContainer.end.getTime())
         throw new TimestampOutOfBoundsError("Provided timestamp is outside the report validity period");
     let prevailing;
     let supplemental = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metar-taf-parser",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Parse METAR and TAF reports",
   "homepage": "https://aeharding.github.io/metar-taf-parser",
   "keywords": [