metar-taf-parser 4.0.0 → 4.1.0

package/locale/en.js

@@ -207,7 +207,7 @@ var en = {
                 Hourly: "{0}/100 of an inch of precipitation fell in the last hour",
             },
             Beg: {
-                "0": "{0} {1} beginning at {2}:{3} ",
+                "0": "{0} {1} beginning at {2}:{3}",
                 End: "{0} {1} beginning at {2}:{3} ending at {4}:{5}",
             },
             End: "{0} {1} ending at {2}:{3}",

package/metar-taf-parser.d.ts

@@ -1101,7 +1101,29 @@ interface ICloud {
     quantity: CloudQuantity;
     type?: CloudType;
 }
-interface IAbstractWeatherContainer {
+interface IFlags {
+    /**
+     * Amended TAF
+     */
+    amendment?: true;
+    /**
+     * Amended METAR
+     */
+    auto?: true;
+    /**
+     * Canceled TAF
+     */
+    canceled?: true;
+    /**
+     * Corrected METAR/TAF
+     */
+    corrected?: true;
+    /**
+     * No data
+     */
+    nil?: true;
+}
+interface IAbstractWeatherContainer extends IFlags {
     wind?: IWind;
     visibility?: Visibility;
     verticalVisibility?: number;
@@ -1138,7 +1160,6 @@ interface IMetar extends IAbstractWeatherCode {
     dewPoint?: number;
     altimeter?: number;
     nosig?: true;
-    auto?: true;
     runwaysInfo: IRunwayInfo[];
     /**
      * Not used in North America
@@ -1149,7 +1170,6 @@ interface ITAF extends IAbstractWeatherCode {
     validity: IValidity;
     maxTemperature?: ITemperatureDated;
     minTemperature?: ITemperatureDated;
-    amendment?: true;
     trends: TAFTrend[];
 }
 interface IAbstractTrend extends IAbstractWeatherContainer {
@@ -1322,4 +1342,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 { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, Distance, DistanceUnit, Forecast, IAbstractTrend, IAbstractValidity, IAbstractWeatherCode, IAbstractWeatherCodeDated, IAbstractWeatherContainer, IAirport, IBaseRemark, IBaseTAFTrend, ICeilingHeightRemark, ICeilingSecondLocationRemark, ICloud, ICompositeForecast, ICountry, IEndValidity, IFMValidity, IForecastContainer, IHourlyMaximumMinimumTemperatureRemark, IHourlyMaximumTemperatureRemark, IHourlyMinimumTemperatureRemark, IHourlyPrecipitationAmountRemark, IHourlyPressureRemark, IHourlyTemperatureDewPointRemark, IIceAccretionRemark, IMetar, IMetarTAFParserOptions, IMetarTAFParserOptionsDated, IMetarTrend, IMetarTrendTime, IObscurationRemark, IPrecipitationAmount24HourRemark, IPrecipitationAmount36HourRemark, IPrecipitationBegEndRemark, IPrevailingVisibilityRemark, IRunwayInfo, ISeaLevelPressureRemark, ISecondLocationVisibilityRemark, ISectorVisibilityRemark, ISmallHailSizeRemark, ISnowIncreaseRemark, ISnowPelletsRemark, ISunshineDurationRemark, ISurfaceVisibilityRemark, ITAF, ITAFDated, ITemperatureDated, IThunderStormLocationMovingRemark, IThunderStormLocationRemark, ITime, ITornadicActivityBegEndRemark, ITornadicActivityBegRemark, ITornadicActivityEndRemark, ITowerVisibilityRemark, IUnknownRemark, IValidity, IValidityDated, IVariableSkyHeightRemark, IVariableSkyRemark, IVirgaDirectionRemark, IWaterEquivalentSnowRemark, IWeatherCondition, IWind, IWindPeakCommandRemark, IWindShear, IWindShiftFropaRemark, Intensity, InvalidWeatherStatementError, Locale, ParseError, Phenomenon, Remark, RemarkType, RunwayInfoTrend, RunwayInfoUnit, TAFTrend, TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };
+export { CloudQuantity, CloudType, CommandExecutionError, Descriptive, Direction, Distance, DistanceUnit, Forecast, IAbstractTrend, IAbstractValidity, IAbstractWeatherCode, IAbstractWeatherCodeDated, IAbstractWeatherContainer, IAirport, IBaseRemark, IBaseTAFTrend, ICeilingHeightRemark, ICeilingSecondLocationRemark, ICloud, ICompositeForecast, ICountry, IEndValidity, IFMValidity, IFlags, IForecastContainer, IHourlyMaximumMinimumTemperatureRemark, IHourlyMaximumTemperatureRemark, IHourlyMinimumTemperatureRemark, IHourlyPrecipitationAmountRemark, IHourlyPressureRemark, IHourlyTemperatureDewPointRemark, IIceAccretionRemark, IMetar, IMetarTAFParserOptions, IMetarTAFParserOptionsDated, IMetarTrend, IMetarTrendTime, IObscurationRemark, IPrecipitationAmount24HourRemark, IPrecipitationAmount36HourRemark, IPrecipitationBegEndRemark, IPrevailingVisibilityRemark, IRunwayInfo, ISeaLevelPressureRemark, ISecondLocationVisibilityRemark, ISectorVisibilityRemark, ISmallHailSizeRemark, ISnowIncreaseRemark, ISnowPelletsRemark, ISunshineDurationRemark, ISurfaceVisibilityRemark, ITAF, ITAFDated, ITemperatureDated, IThunderStormLocationMovingRemark, IThunderStormLocationRemark, ITime, ITornadicActivityBegEndRemark, ITornadicActivityBegRemark, ITornadicActivityEndRemark, ITowerVisibilityRemark, IUnknownRemark, IValidity, IValidityDated, IVariableSkyHeightRemark, IVariableSkyRemark, IVirgaDirectionRemark, IWaterEquivalentSnowRemark, IWeatherCondition, IWind, IWindPeakCommandRemark, IWindShear, IWindShiftFropaRemark, Intensity, InvalidWeatherStatementError, Locale, ParseError, Phenomenon, Remark, RemarkType, RunwayInfoTrend, RunwayInfoUnit, TAFTrend, TAFTrendDated, TimeIndicator, TimestampOutOfBoundsError, UnexpectedParseError, ValueIndicator, Visibility, WeatherChangeType, getCompositeForecastForDate, isWeatherConditionValid, parseMetar, parseTAF, parseTAFAsForecast };

package/metar-taf-parser.js

@@ -87,7 +87,7 @@ function pySplit(string, separator, n) {
  */
 function resolve(obj, path, separator = ".") {
     const properties = Array.isArray(path) ? path : path.split(separator);
-    return properties.reduce((prev, curr) => prev === null || prev === void 0 ? void 0 : prev[curr], obj);
+    return properties.reduce((prev, curr) => prev?.[curr], obj);
 }
 /**
  * For safely casting input values
@@ -1537,7 +1537,7 @@ class DefaultCommand extends Command {
         }
         else {
             const lastRemark = remark[remark.length - 1];
-            if ((lastRemark === null || lastRemark === void 0 ? void 0 : lastRemark.type) === RemarkType.Unknown) {
+            if (lastRemark?.type === RemarkType.Unknown) {
                 // Merge with last unknown value
                 lastRemark.raw = `${lastRemark.raw} ${rmkSplit[0]}`;
             }
@@ -1562,13 +1562,12 @@ class PrecipitationBegCommand extends Command {
         return __classPrivateFieldGet(this, _PrecipitationBegCommand_regex, "f").test(code);
     }
     execute(code, remark) {
-        var _a;
         const matches = code.match(__classPrivateFieldGet(this, _PrecipitationBegCommand_regex, "f"));
         if (!matches)
             throw new UnexpectedParseError("Match not found");
         const descriptive = matches[2] ? as(matches[2], Descriptive) : undefined;
         const phenomenon = as(matches[3], Phenomenon);
-        const description = (_a = format(_("Remark.Precipitation.Beg.0", this.locale), descriptive ? _(`Descriptive.${descriptive}`, this.locale) : "", _(`Phenomenon.${phenomenon}`, this.locale), matches[4] || "", matches[5])) === null || _a === void 0 ? void 0 : _a.trim();
+        const description = format(_("Remark.Precipitation.Beg.0", this.locale), descriptive ? _(`Descriptive.${descriptive}`, this.locale) : "", _(`Phenomenon.${phenomenon}`, this.locale), matches[4] || "", matches[5])?.trim();
         remark.push({
             type: RemarkType.PrecipitationBeg,
             description,
@@ -1593,13 +1592,12 @@ class PrecipitationEndCommand extends Command {
         return __classPrivateFieldGet(this, _PrecipitationEndCommand_regex, "f").test(code);
     }
     execute(code, remark) {
-        var _a;
         const matches = code.match(__classPrivateFieldGet(this, _PrecipitationEndCommand_regex, "f"));
         if (!matches)
             throw new UnexpectedParseError("Match not found");
         const descriptive = matches[2] ? as(matches[2], Descriptive) : undefined;
         const phenomenon = as(matches[3], Phenomenon);
-        const description = (_a = format(_("Remark.Precipitation.End", this.locale), descriptive ? _(`Descriptive.${descriptive}`, this.locale) : "", _(`Phenomenon.${phenomenon}`, this.locale), matches[4] || "", matches[5])) === null || _a === void 0 ? void 0 : _a.trim();
+        const description = format(_("Remark.Precipitation.End", this.locale), descriptive ? _(`Descriptive.${descriptive}`, this.locale) : "", _(`Phenomenon.${phenomenon}`, this.locale), matches[4] || "", matches[5])?.trim();
         remark.push({
             type: RemarkType.PrecipitationEnd,
             description,
@@ -1790,7 +1788,7 @@ class MainVisibilityCommand {
         const distance = convertVisibility(matches[1]);
         if (!container.visibility)
             container.visibility = distance;
-        container.visibility = Object.assign(Object.assign({}, container.visibility), distance);
+        container.visibility = { ...container.visibility, ...distance };
         if (matches[2] === "NDV")
             container.visibility.ndv = true;
         return true;
@@ -1850,7 +1848,10 @@ class WindShearCommand {
         const matches = windString.match(__classPrivateFieldGet(this, _WindShearCommand_regex, "f"));
         if (!matches)
             throw new UnexpectedParseError("Wind shear should be defined");
-        return Object.assign(Object.assign({}, makeWind(matches[2], matches[3], matches[4], matches[5])), { height: 100 * +matches[1] });
+        return {
+            ...makeWind(matches[2], matches[3], matches[4], matches[5]),
+            height: 100 * +matches[1],
+        };
     }
     execute(container, windString) {
         container.windShear = this.parseWindShear(windString);
@@ -2070,6 +2071,24 @@ function parseDeliveryTime(timeString) {
         minute,
     };
 }
+function parseFlags(abstractWeatherCode, flag) {
+    const flags = findFlags(flag);
+    if (flags)
+        Object.assign(abstractWeatherCode, flags);
+    return !!flags;
+}
+var FlagMap;
+(function (FlagMap) {
+    FlagMap["AMD"] = "amendment";
+    FlagMap["AUTO"] = "auto";
+    FlagMap["CNL"] = "canceled";
+    FlagMap["COR"] = "corrected";
+    FlagMap["NIL"] = "nil";
+})(FlagMap || (FlagMap = {}));
+function findFlags(flag) {
+    if (flag in FlagMap)
+        return { [FlagMap[flag]]: true };
+}
 /**
  * This function parses the array containing the remark and concat the array into a string
  * @param container the metar, taf or taf trend to update
@@ -2140,10 +2159,9 @@ class AbstractParser {
         _AbstractParser_commonSupplier.set(this, new CommandSupplier$1());
     }
     parseWeatherCondition(input) {
-        var _a;
         let intensity;
         if (input.match(__classPrivateFieldGet(this, _AbstractParser_INTENSITY_REGEX, "f"))) {
-            const match = (_a = input.match(__classPrivateFieldGet(this, _AbstractParser_INTENSITY_REGEX, "f"))) === null || _a === void 0 ? void 0 : _a[0];
+            const match = input.match(__classPrivateFieldGet(this, _AbstractParser_INTENSITY_REGEX, "f"))?.[0];
             if (match)
                 intensity = match;
         }
@@ -2184,7 +2202,6 @@ class AbstractParser {
             if (digitRegex.test(splitted[i])) {
                 if (splitted[i + 1] && smRegex.test(splitted[i + 1])) {
                     splitted.splice(i, 2, `${splitted[i]} ${splitted[i + 1]}`);
-                    i--;
                 }
             }
         }
@@ -2262,16 +2279,23 @@ class MetarParser extends AbstractParser {
      */
     parse(input) {
         const metarTab = this.tokenize(input);
-        const metar = Object.assign(Object.assign({}, parseDeliveryTime(metarTab[1])), { station: metarTab[0], message: input, remarks: [], clouds: [], weatherConditions: [], trends: [], runwaysInfo: [] });
+        const metar = {
+            ...parseDeliveryTime(metarTab[1]),
+            station: metarTab[0],
+            message: input,
+            remarks: [],
+            clouds: [],
+            weatherConditions: [],
+            trends: [],
+            runwaysInfo: [],
+        };
         let index = 2;
         while (index < metarTab.length) {
-            if (!super.generalParse(metar, metarTab[index])) {
+            if (!super.generalParse(metar, metarTab[index]) &&
+                !parseFlags(metar, metarTab[index])) {
                 if (metarTab[index] === "NOSIG") {
                     metar.nosig = true;
                 }
-                else if (metarTab[index] === "AUTO") {
-                    metar.auto = true;
-                }
                 else if (metarTab[index] === this.TEMPO ||
                     metarTab[index] === this.BECMG) {
                     const trend = {
@@ -2319,15 +2343,14 @@ class TAFParser extends AbstractParser {
      * @throws ParseError if the message is invalid
      */
     parse(input) {
-        let amendment;
         const lines = this.extractLinesTokens(input);
         let index = 0;
         if (lines[0][0] === this.TAF)
             index = 1;
         if (lines[0][1] === this.TAF)
             index = 2;
-        if (lines[0][index] === "AMD") {
-            amendment = true;
+        const flags = findFlags(lines[0][index]);
+        if (flags) {
             index += 1;
         }
         const station = lines[0][index];
@@ -2335,8 +2358,17 @@ class TAFParser extends AbstractParser {
         const time = parseDeliveryTime(lines[0][index]);
         index += 1;
         const validity = parseValidity(lines[0][index]);
-        const taf = Object.assign(Object.assign({ station,
-            amendment }, time), { validity, message: input, trends: [], remarks: [], clouds: [], weatherConditions: [] });
+        const taf = {
+            station,
+            ...flags,
+            ...time,
+            validity,
+            message: input,
+            trends: [],
+            remarks: [],
+            clouds: [],
+            weatherConditions: [],
+        };
         for (let i = index + 1; i < lines[0].length; i++) {
             const token = lines[0][i];
             if (token == this.RMK) {
@@ -2347,8 +2379,10 @@ class TAFParser extends AbstractParser {
                 taf.maxTemperature = parseTemperature(token);
             else if (token.startsWith(this.TN))
                 taf.minTemperature = parseTemperature(token);
-            else
+            else {
+                parseFlags(taf, token);
                 this.generalParse(taf, token);
+            }
         }
         // Handle the other lines
         for (let i = 1; i < lines.length; i++) {
@@ -2370,9 +2404,8 @@ class TAFParser extends AbstractParser {
         // TODO cleanup
         function joinProbIfNeeded(ls) {
             for (let i = 0; i < ls.length; i++) {
-                if (/PROB\d{2}/.test(ls[i]) && /TEMPO/.test(ls[i + 1])) {
+                if (/^PROB\d{2}$/.test(ls[i]) && /^TEMPO/.test(ls[i + 1])) {
                     ls.splice(i, 2, `${ls[i]} ${ls[i + 1]}`);
-                    i--;
                 }
             }
             return ls;
@@ -2397,15 +2430,27 @@ class TAFParser extends AbstractParser {
         let index = 1;
         let trend;
         if (lineTokens[0].startsWith(this.FM)) {
-            trend = Object.assign(Object.assign({}, this.makeEmptyTAFTrend()), { type: WeatherChangeType.FM, validity: parseFromValidity(lineTokens[0]) });
+            trend = {
+                ...this.makeEmptyTAFTrend(),
+                type: WeatherChangeType.FM,
+                validity: parseFromValidity(lineTokens[0]),
+            };
         }
         else if (lineTokens[0].startsWith(this.PROB)) {
             const validity = this.findLineValidity(index, lineTokens);
             if (!validity)
                 return;
-            trend = Object.assign(Object.assign({}, this.makeEmptyTAFTrend()), { type: WeatherChangeType.PROB, validity });
+            trend = {
+                ...this.makeEmptyTAFTrend(),
+                type: WeatherChangeType.PROB,
+                validity,
+            };
             if (lineTokens.length > 1 && lineTokens[1] === this.TEMPO) {
-                trend = Object.assign(Object.assign({}, this.makeEmptyTAFTrend()), { type: WeatherChangeType[lineTokens[1]], validity });
+                trend = {
+                    ...this.makeEmptyTAFTrend(),
+                    type: WeatherChangeType[lineTokens[1]],
+                    validity,
+                };
                 index = 2;
             }
             trend.probability = +lineTokens[0].slice(4);
@@ -2414,7 +2459,11 @@ class TAFParser extends AbstractParser {
             const validity = this.findLineValidity(index, lineTokens);
             if (!validity)
                 return;
-            trend = Object.assign(Object.assign({}, this.makeEmptyTAFTrend()), { type: WeatherChangeType[lineTokens[0]], validity });
+            trend = {
+                ...this.makeEmptyTAFTrend(),
+                type: WeatherChangeType[lineTokens[0]],
+                validity,
+            };
         }
         this.parseTrend(index, lineTokens, trend);
         taf.trends.push(trend);
@@ -2540,19 +2589,41 @@ function addMonthsUTC(date, count) {
 }
 
 function metarDatesHydrator(report, date) {
-    return Object.assign(Object.assign({}, report), { issued: determineReportIssuedDate(date, report.day, report.hour, report.minute) });
+    return {
+        ...report,
+        issued: determineReportIssuedDate(date, report.day, report.hour, report.minute),
+    };
 }
 
 function tafDatesHydrator(report, date) {
     const issued = determineReportIssuedDate(date, report.day, report.hour, report.minute);
-    return Object.assign(Object.assign({}, report), { issued, validity: Object.assign(Object.assign({}, report.validity), { start: getReportDate(issued, report.validity.startDay, report.validity.startHour), end: getReportDate(issued, report.validity.endDay, report.validity.endHour) }), trends: report.trends.map((trend) => (Object.assign(Object.assign({}, trend), { validity: (() => {
+    return {
+        ...report,
+        issued,
+        validity: {
+            ...report.validity,
+            start: getReportDate(issued, report.validity.startDay, report.validity.startHour),
+            end: getReportDate(issued, report.validity.endDay, report.validity.endHour),
+        },
+        trends: report.trends.map((trend) => ({
+            ...trend,
+            validity: (() => {
                 switch (trend.type) {
                     case WeatherChangeType.FM:
-                        return Object.assign(Object.assign({}, trend.validity), { start: getReportDate(issued, trend.validity.startDay, trend.validity.startHour, trend.validity.startMinutes) });
+                        return {
+                            ...trend.validity,
+                            start: getReportDate(issued, trend.validity.startDay, trend.validity.startHour, trend.validity.startMinutes),
+                        };
                     default:
-                        return Object.assign(Object.assign({}, trend.validity), { start: getReportDate(issued, trend.validity.startDay, trend.validity.startHour), end: getReportDate(issued, trend.validity.endDay, trend.validity.endHour) });
+                        return {
+                            ...trend.validity,
+                            start: getReportDate(issued, trend.validity.startDay, trend.validity.startHour),
+                            end: getReportDate(issued, trend.validity.endDay, trend.validity.endHour),
+                        };
                 }
-            })() }))) });
+            })(),
+        })),
+    };
 }
 
 function getForecastFromTAF(taf) {
@@ -2631,7 +2702,7 @@ function parseTAFAsForecast(rawTAF, options) {
     return getForecastFromTAF(taf);
 }
 function parse(rawReport, options, parser, datesHydrator) {
-    const lang = (options === null || options === void 0 ? void 0 : options.locale) || en;
+    const lang = options?.locale || en;
     try {
         const report = new parser(lang).parse(rawReport);
         if (options && "date" in options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metar-taf-parser",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Parse METAR and TAF reports",
   "homepage": "https://aeharding.github.io/metar-taf-parser",
   "keywords": [
@@ -25,7 +25,7 @@
     "build": "yarn clean && rollup -c rollup.config.ts && cp -R dist/locale/. locale/ && cp dist/metar-taf-parser.js metar-taf-parser.js && yarn clean:after",
     "clean:after": "rimraf dist",
     "start": "rollup -c rollup.config.ts -w",
-    "check-types": "tsc --noEmit",
+    "check-types": "tsc --skipLibCheck --noEmit",
     "check-formatting": "prettier --check '**/*.{js,json,css,md,scss,tsx,ts}'",
     "watch": "watch 'yarn build' src",
     "test": "jest --coverage",
@@ -47,7 +47,7 @@
     "prettier": "^2.6.2",
     "rollup": "^2.71.1",
     "rollup-plugin-dts": "^4.2.1",
-    "ts-jest": "28.0.0-next.3",
+    "ts-jest": "^28.0.1",
     "ts-node": "^10.7.0",
     "tsc-alias": "^1.6.7",
     "tslib": "^2.4.0",