metar-taf-parser 9.0.1 → 9.1.1

package/locale/en.d.ts

@@ -142,6 +142,7 @@ declare const _default: {
         ALQDS: string;
         AO1: string;
         AO2: string;
+        AO2A: string;
         BASED: string;
         Barometer: string[];
         Ceiling: {
@@ -183,6 +184,11 @@ declare const _default: {
         LGT: string;
         LTG: string;
         MOD: string;
+        Next: {
+            Forecast: {
+                By: string;
+            };
+        };
         NXT: string;
         ON: string;
         Obscuration: string;

package/locale/en.js

@@ -94,7 +94,7 @@ var en = {
         TS: "thunderstorm",
     },
     Error: {
-        prefix: "An error occured. Error code n°",
+        prefix: "An error occurred. Error code n°",
     },
     ErrorCode: {
         AirportNotFound: "The airport was not found for this message.",
@@ -142,6 +142,7 @@ var en = {
         ALQDS: "all quadrants",
         AO1: "automated stations without a precipitation discriminator",
         AO2: "automated station with a precipitation discriminator",
+        AO2A: "automated station with a precipitation discriminator (augmented)",
         BASED: "based",
         Barometer: [
             "Increase, then decrease",
@@ -157,7 +158,7 @@ var en = {
         Ceiling: {
             Height: "ceiling varying between {0} and {1} feet",
             Second: {
-                Location: "ceiling of {0} feet mesured by a second sensor located at {1}",
+                Location: "ceiling of {0} feet measured by a second sensor located at {1}",
             },
         },
         DSNT: "distant",
@@ -193,6 +194,11 @@ var en = {
         LGT: "light",
         LTG: "lightning",
         MOD: "moderate",
+        Next: {
+            Forecast: {
+                By: "next forecast by {0}, {1}:{2}Z"
+            },
+        },
         NXT: "next",
         ON: "on",
         Obscuration: "{0} layer at {1} feet composed of {2}",
@@ -224,7 +230,7 @@ var en = {
         },
         Second: {
             Location: {
-                Visibility: "visibility of {0} SM mesured by a second sensor located at {1}",
+                Visibility: "visibility of {0} SM measured by a second sensor located at {1}",
             },
         },
         Sector: {

package/metar-taf-parser.d.ts

@@ -517,6 +517,7 @@ declare const _default: {
         ALQDS: string;
         AO1: string;
         AO2: string;
+        AO2A: string;
         BASED: string;
         Barometer: string[];
         Ceiling: {
@@ -558,6 +559,11 @@ declare const _default: {
         LGT: string;
         LTG: string;
         MOD: string;
+        Next: {
+            Forecast: {
+                By: string;
+            };
+        };
         NXT: string;
         ON: string;
         Obscuration: string;
@@ -1079,6 +1085,17 @@ interface IPrecipitationEndRemark extends IBaseRemark {
     endMin: number;
 }
 
+interface INextForecastByRemark extends IBaseRemark {
+    type: RemarkType.NextForecastBy;
+    day: number;
+    hour: number;
+    minute: number;
+}
+interface INextForecastByRemarkDated extends INextForecastByRemark {
+    type: RemarkType.NextForecastBy;
+    date: Date;
+}
+
 interface IBaseRemark {
     type: RemarkType;
     description?: string;
@@ -1135,9 +1152,12 @@ declare enum RemarkType {
     PrecipitationAmount24Hour = "PrecipitationAmount24Hour",
     SnowDepth = "SnowDepth",
     SunshineDuration = "SunshineDuration",
-    WaterEquivalentSnow = "WaterEquivalentSnow"
+    WaterEquivalentSnow = "WaterEquivalentSnow",
+    NextForecastBy = "NextForecastBy"
 }
-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;
+type RemarkBase = IUnknownRemark | IDefaultCommandRemark | ICeilingHeightRemark | ICeilingSecondLocationRemark | IHailSizeRemark | IHourlyMaximumMinimumTemperatureRemark | IHourlyMaximumTemperatureRemark | IHourlyMinimumTemperatureRemark | IHourlyPrecipitationAmountRemark | IHourlyPressureRemark | IHourlyTemperatureDewPointRemark | IIceAccretionRemark | IObscurationRemark | IPrecipitationAmount24HourRemark | 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;
+type RemarkDated = RemarkBase | INextForecastByRemarkDated;
+type Remark = RemarkBase | INextForecastByRemark;
 
 interface IWind {
     speed: number;
@@ -1443,6 +1463,7 @@ type TAFTrendDated = IAbstractTrend & IBaseTAFTrend & {
         start: Date;
         end?: Date;
     };
+    remarks: RemarkDated[];
 } & ({
     type: WeatherChangeType.FM;
     validity: IFMValidity & {
@@ -1464,6 +1485,7 @@ interface ITAFDated extends ITAF {
     minTemperature?: ITemperatureDated;
     maxTemperature?: ITemperatureDated;
     trends: TAFTrendDated[];
+    remarks: RemarkDated[];
 }
 
 declare abstract class ParseError extends Error {
@@ -1571,4 +1593,4 @@ declare function parseTAF(rawTAF: string, options?: IMetarTAFParserOptions): ITA
 declare function parseTAF(rawTAF: string, options?: IMetarTAFParserOptionsDated): ITAFDated;
 declare function parseTAFAsForecast(rawTAF: string, options: IMetarTAFParserOptionsDated): IForecastContainer;
 
-export { AltimeterUnit, CloudQuantity, CloudType, CommandExecutionError, DepositCoverage, DepositType, Descriptive, Direction, type Distance, DistanceUnit, type Forecast, type IAbstractTrend, type IAbstractValidity, type IAbstractWeatherCode, type IAbstractWeatherCodeDated, type IAbstractWeatherContainer, type IAltimeter, type IBaseRemark, type IBaseRunwayInfo, type IBaseTAFTrend, type ICeilingHeightRemark, type ICeilingSecondLocationRemark, type ICloud, type ICompositeForecast, type IEndValidity, type IFMValidity, type IFlags, type IForecastContainer, type IHourlyMaximumMinimumTemperatureRemark, type IHourlyMaximumTemperatureRemark, type IHourlyMinimumTemperatureRemark, type IHourlyPrecipitationAmountRemark, type IHourlyPressureRemark, type IHourlyTemperatureDewPointRemark, type IIceAccretionRemark, type IIcing, type IMetar, type IMetarDated, type IMetarTAFParserOptions, type IMetarTAFParserOptionsDated, type IMetarTrend, type IMetarTrendTime, type IObscurationRemark, type IPrecipitationAmount24HourRemark, type IPrecipitationAmount36HourRemark, type IPrecipitationBegEndRemark, type IPrevailingVisibilityRemark, type IRunwayInfoDeposit, type IRunwayInfoRange, type ISeaLevelPressureRemark, type ISecondLocationVisibilityRemark, type ISectorVisibilityRemark, type ISmallHailSizeRemark, type ISnowIncreaseRemark, type ISnowPelletsRemark, type ISunshineDurationRemark, type ISurfaceVisibilityRemark, type ITAF, type ITAFDated, type ITafGroups, type ITemperature, type ITemperatureDated, type IThunderStormLocationMovingRemark, type IThunderStormLocationRemark, type ITime, type ITornadicActivityBegEndRemark, type ITornadicActivityBegRemark, type ITornadicActivityEndRemark, type ITowerVisibilityRemark, type ITurbulence, type IUnknownRemark, type IValidity, type IValidityDated, type IVariableSkyHeightRemark, type IVariableSkyRemark, type IVirgaDirectionRemark, type IWaterEquivalentSnowRemark, type IWeatherCondition, type IWind, type IWindPeakCommandRemark, type IWindShear, type IWindShiftFropaRemark, IcingIntensity, Intensity, InvalidWeatherStatementError, type Locale, MetarType, ParseError, PartialWeatherStatementError, Phenomenon, type Remark, RemarkType, type RunwayInfo, RunwayInfoTrend, RunwayInfoUnit, SpeedUnit, type TAFTrend, type TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, TurbulenceIntensity, UnexpectedParseError, ValueIndicator, type Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };
+export { AltimeterUnit, CloudQuantity, CloudType, CommandExecutionError, DepositCoverage, DepositType, Descriptive, Direction, type Distance, DistanceUnit, type Forecast, type IAbstractTrend, type IAbstractValidity, type IAbstractWeatherCode, type IAbstractWeatherCodeDated, type IAbstractWeatherContainer, type IAltimeter, type IBaseRemark, type IBaseRunwayInfo, type IBaseTAFTrend, type ICeilingHeightRemark, type ICeilingSecondLocationRemark, type ICloud, type ICompositeForecast, type IEndValidity, type IFMValidity, type IFlags, type IForecastContainer, type IHourlyMaximumMinimumTemperatureRemark, type IHourlyMaximumTemperatureRemark, type IHourlyMinimumTemperatureRemark, type IHourlyPrecipitationAmountRemark, type IHourlyPressureRemark, type IHourlyTemperatureDewPointRemark, type IIceAccretionRemark, type IIcing, type IMetar, type IMetarDated, type IMetarTAFParserOptions, type IMetarTAFParserOptionsDated, type IMetarTrend, type IMetarTrendTime, type INextForecastByRemark, type INextForecastByRemarkDated, type IObscurationRemark, type IPrecipitationAmount24HourRemark, type IPrecipitationAmount36HourRemark, type IPrecipitationBegEndRemark, type IPrevailingVisibilityRemark, type IRunwayInfoDeposit, type IRunwayInfoRange, type ISeaLevelPressureRemark, type ISecondLocationVisibilityRemark, type ISectorVisibilityRemark, type ISmallHailSizeRemark, type ISnowIncreaseRemark, type ISnowPelletsRemark, type ISunshineDurationRemark, type ISurfaceVisibilityRemark, type ITAF, type ITAFDated, type ITafGroups, type ITemperature, type ITemperatureDated, type IThunderStormLocationMovingRemark, type IThunderStormLocationRemark, type ITime, type ITornadicActivityBegEndRemark, type ITornadicActivityBegRemark, type ITornadicActivityEndRemark, type ITowerVisibilityRemark, type ITurbulence, type IUnknownRemark, type IValidity, type IValidityDated, type IVariableSkyHeightRemark, type IVariableSkyRemark, type IVirgaDirectionRemark, type IWaterEquivalentSnowRemark, type IWeatherCondition, type IWind, type IWindPeakCommandRemark, type IWindShear, type IWindShiftFropaRemark, IcingIntensity, Intensity, InvalidWeatherStatementError, type Locale, MetarType, ParseError, PartialWeatherStatementError, Phenomenon, type Remark, type RemarkDated, RemarkType, type RunwayInfo, RunwayInfoTrend, RunwayInfoUnit, SpeedUnit, type TAFTrend, type TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, TurbulenceIntensity, UnexpectedParseError, ValueIndicator, type Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };

package/metar-taf-parser.js

@@ -14,7 +14,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __classPrivateFieldGet(receiver, state, kind, f) {
@@ -1752,6 +1752,36 @@ class PrecipitationEndCommand extends Command {
 }
 _PrecipitationEndCommand_regex = new WeakMap();
 
+var _NextForecastByCommand_regex;
+class NextForecastByCommand extends Command {
+    constructor() {
+        super(...arguments);
+        _NextForecastByCommand_regex.set(this, /^NXT FCST BY (\d{2})(\d{2})(\d{2})Z/);
+    }
+    canParse(code) {
+        return __classPrivateFieldGet(this, _NextForecastByCommand_regex, "f").test(code);
+    }
+    execute(code, remark) {
+        const matches = code.match(__classPrivateFieldGet(this, _NextForecastByCommand_regex, "f"));
+        if (!matches)
+            throw new UnexpectedParseError("Match not found");
+        const day = +matches[1];
+        const hour = matches[2];
+        const minute = matches[3];
+        const description = format(_("Remark.Next.Forecast.By", this.locale), day, hour, minute);
+        remark.push({
+            type: RemarkType.NextForecastBy,
+            description,
+            raw: matches[0],
+            day,
+            hour: +hour,
+            minute: +minute,
+        });
+        return [code.replace(__classPrivateFieldGet(this, _NextForecastByCommand_regex, "f"), "").trim(), remark];
+    }
+}
+_NextForecastByCommand_regex = new WeakMap();
+
 class RemarkCommandSupplier {
     constructor(locale) {
         this.locale = locale;
@@ -1796,6 +1826,7 @@ class RemarkCommandSupplier {
             new SnowDepthCommand(locale),
             new SunshineDurationCommand(locale),
             new WaterEquivalentSnowCommand(locale),
+            new NextForecastByCommand(locale),
         ];
     }
     get(code) {
@@ -1859,6 +1890,8 @@ var RemarkType;
     RemarkType["SnowDepth"] = "SnowDepth";
     RemarkType["SunshineDuration"] = "SunshineDuration";
     RemarkType["WaterEquivalentSnow"] = "WaterEquivalentSnow";
+    // Canada commands below
+    RemarkType["NextForecastBy"] = "NextForecastBy";
 })(RemarkType || (RemarkType = {}));
 
 function isWeatherConditionValid(weather) {
@@ -2117,8 +2150,8 @@ var _RunwayCommand_genericRegex, _RunwayCommand_runwayMaxRangeRegex, _RunwayComm
 class RunwayCommand {
     constructor() {
         _RunwayCommand_genericRegex.set(this, /^(R\d{2}\w?\/)/);
-        _RunwayCommand_runwayMaxRangeRegex.set(this, /^R(\d{2}\w?)\/(\d{4})V(\d{3,4})([UDN])?(FT)?/);
-        _RunwayCommand_runwayRegex.set(this, /^R(\d{2}\w?)\/([MP])?(\d{4})([UDN])?(FT)?$/);
+        _RunwayCommand_runwayMaxRangeRegex.set(this, /^R(\d{2}\w?)\/(\d{4})V(\d{3,4})(?:([UDN])|(FT)(?:\/([UDN]))?)$/);
+        _RunwayCommand_runwayRegex.set(this, /^R(\d{2}\w?)\/([MP])?(\d{4})(?:([UDN])|(FT)(?:\/([UDN]))?)$/);
         _RunwayCommand_runwayDepositRegex.set(this, /^R(\d{2}\w?)\/([/\d])([/\d])(\/\/|\d{2})(\/\/|\d{2})$/);
     }
     canParse(input) {
@@ -2144,7 +2177,12 @@ class RunwayCommand {
             if (!matches)
                 throw new UnexpectedParseError("Should be able to parse");
             const indicator = matches[2] ? as(matches[2], ValueIndicator) : undefined;
-            const trend = matches[4] ? as(matches[4], RunwayInfoTrend) : undefined;
+            const trend = (() => {
+                if (matches[6])
+                    return as(matches[6], RunwayInfoTrend);
+                if (matches[4])
+                    return as(matches[4], RunwayInfoTrend);
+            })();
             const unit = matches[5]
                 ? as(matches[5], RunwayInfoUnit)
                 : RunwayInfoUnit.Meters;
@@ -2160,7 +2198,12 @@ class RunwayCommand {
             const matches = input.match(__classPrivateFieldGet(this, _RunwayCommand_runwayMaxRangeRegex, "f"));
             if (!matches)
                 throw new UnexpectedParseError("Should be able to parse");
-            const trend = matches[4] ? as(matches[4], RunwayInfoTrend) : undefined;
+            const trend = (() => {
+                if (matches[6])
+                    return as(matches[6], RunwayInfoTrend);
+                if (matches[4])
+                    return as(matches[4], RunwayInfoTrend);
+            })();
             const unit = matches[5]
                 ? as(matches[5], RunwayInfoUnit)
                 : RunwayInfoUnit.Meters;
@@ -2900,6 +2943,17 @@ function metarDatesHydrator(report, date) {
     };
 }
 
+function remarksDatesHydrator(remarks, date) {
+    return remarks.map((remark) => {
+        if (remark.type === RemarkType.NextForecastBy) {
+            return {
+                ...remark,
+                date: determineReportDate(date, remark.day, remark.hour, remark.minute),
+            };
+        }
+        return remark;
+    });
+}
 function tafDatesHydrator(report, date) {
     const issued = determineReportDate(date, report.day, report.hour, report.minute);
     return {
@@ -2924,6 +2978,7 @@ function tafDatesHydrator(report, date) {
             : undefined,
         trends: report.trends.map((trend) => ({
             ...trend,
+            remarks: remarksDatesHydrator(trend.remarks, issued),
             validity: (() => {
                 switch (trend.type) {
                     case WeatherChangeType.FM:
@@ -2940,6 +2995,7 @@ function tafDatesHydrator(report, date) {
                 }
             })(),
         })),
+        remarks: remarksDatesHydrator(report.remarks, issued),
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metar-taf-parser",
-  "version": "9.0.1",
+  "version": "9.1.1",
   "description": "Parse METAR and TAF reports",
   "homepage": "https://aeharding.github.io/metar-taf-parser",
   "packageManager": "pnpm@9.0.6+sha256.0624e30eff866cdeb363b15061bdb7fd9425b17bc1bb42c22f5f4efdea21f6b3",
@@ -39,23 +39,23 @@
     "metar-taf-parser.*"
   ],
   "devDependencies": {
-    "@babel/preset-env": "^7.24.5",
-    "@babel/preset-typescript": "^7.24.1",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/jest": "^29.5.12",
-    "@types/lodash": "^4.17.1",
-    "@types/node": "^20.12.8",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
+    "@rollup/plugin-typescript": "^12.1.2",
+    "@types/jest": "^29.5.14",
+    "@types/lodash": "^4.17.14",
+    "@types/node": "^22.10.5",
     "jest": "^29.7.0",
     "lodash": "^4.17.21",
-    "prettier": "^3.2.5",
-    "rimraf": "^5.0.5",
-    "rollup": "^4.17.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "ts-jest": "^29.1.2",
+    "prettier": "^3.4.2",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.29.2",
+    "rollup-plugin-dts": "^6.1.1",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "tsc-alias": "^1.8.8",
-    "tslib": "^2.6.2",
-    "typescript": "^5.4.5",
+    "tsc-alias": "^1.8.10",
+    "tslib": "^2.8.1",
+    "typescript": "^5.7.2",
     "watch": "^1.0.2"
   }
 }