@start9labs/start-sdk 0.4.0-beta.9 → 0.4.0

package/base/lib/dependencies/dependencies.js

@@ -12,7 +12,7 @@ async function checkDependencies(effects, packageIds) {
     if (packageIds) {
         dependencies = dependencies.filter((d) => packageIds.includes(d.id));
     }
-    const find = (packageId) => {
+    const infoFor = (packageId) => {
         const dependencyRequirement = dependencies.find((d) => d.id === packageId);
         const dependencyResult = results.find((d) => d.packageId === packageId);
         if (!dependencyRequirement || !dependencyResult) {
@@ -20,46 +20,49 @@ async function checkDependencies(effects, packageIds) {
         }
         return { requirement: dependencyRequirement, result: dependencyResult };
     };
-    const installedSatisfied = (packageId) => !!find(packageId).result.installedVersion;
+    const installedSatisfied = (packageId) => !!infoFor(packageId).result.installedVersion;
     const installedVersionSatisfied = (packageId) => {
-        const dep = find(packageId);
+        const dep = infoFor(packageId);
         return (!!dep.result.installedVersion &&
             exver_1.ExtendedVersion.parse(dep.result.installedVersion).satisfies(exver_1.VersionRange.parse(dep.requirement.versionRange)));
     };
     const runningSatisfied = (packageId) => {
-        const dep = find(packageId);
-        return dep.requirement.kind !== "running" || dep.result.isRunning;
+        const dep = infoFor(packageId);
+        return dep.requirement.kind !== 'running' || dep.result.isRunning;
     };
-    const actionsSatisfied = (packageId) => Object.entries(find(packageId).result.requestedActions).filter(([_, req]) => req.active && req.request.severity === "critical").length === 0;
+    const tasksSatisfied = (packageId) => Object.entries(infoFor(packageId).result.tasks).filter(([_, t]) => t?.active && t.task.severity === 'critical').length === 0;
     const healthCheckSatisfied = (packageId, healthCheckId) => {
-        const dep = find(packageId);
+        const dep = infoFor(packageId);
         if (healthCheckId &&
-            (dep.requirement.kind !== "running" ||
+            (dep.requirement.kind !== 'running' ||
                 !dep.requirement.healthChecks.includes(healthCheckId))) {
             throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
         }
-        const errors = Object.entries(dep.result.healthChecks)
-            .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
-            .filter(([_, res]) => res.result !== "success");
+        const errors = dep.requirement.kind === 'running'
+            ? dep.requirement.healthChecks
+                .map((id) => [id, dep.result.healthChecks[id] ?? null])
+                .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+                .filter(([_, res]) => res?.result !== 'success')
+            : [];
         return errors.length === 0;
     };
     const pkgSatisfied = (packageId) => installedSatisfied(packageId) &&
         installedVersionSatisfied(packageId) &&
         runningSatisfied(packageId) &&
-        actionsSatisfied(packageId) &&
+        tasksSatisfied(packageId) &&
         healthCheckSatisfied(packageId);
     const satisfied = (packageId) => packageId
         ? pkgSatisfied(packageId)
         : dependencies.every((d) => pkgSatisfied(d.id));
     const throwIfInstalledNotSatisfied = (packageId) => {
-        const dep = find(packageId);
+        const dep = infoFor(packageId);
         if (!dep.result.installedVersion) {
             throw new Error(`${dep.result.title || packageId} is not installed`);
         }
         return null;
     };
     const throwIfInstalledVersionNotSatisfied = (packageId) => {
-        const dep = find(packageId);
+        const dep = infoFor(packageId);
         if (!dep.result.installedVersion) {
             throw new Error(`${dep.result.title || packageId} is not installed`);
         }
@@ -69,36 +72,41 @@ async function checkDependencies(effects, packageIds) {
         return null;
     };
     const throwIfRunningNotSatisfied = (packageId) => {
-        const dep = find(packageId);
-        if (dep.requirement.kind === "running" && !dep.result.isRunning) {
+        const dep = infoFor(packageId);
+        if (dep.requirement.kind === 'running' && !dep.result.isRunning) {
             throw new Error(`${dep.result.title || packageId} is not running`);
         }
         return null;
     };
-    const throwIfActionsNotSatisfied = (packageId) => {
-        const dep = find(packageId);
-        const reqs = Object.entries(dep.result.requestedActions)
-            .filter(([_, req]) => req.active && req.request.severity === "critical")
+    const throwIfTasksNotSatisfied = (packageId) => {
+        const dep = infoFor(packageId);
+        const reqs = Object.entries(dep.result.tasks)
+            .filter(([_, t]) => t?.active && t.task.severity === 'critical')
             .map(([id, _]) => id);
         if (reqs.length) {
-            throw new Error(`The following action requests have not been fulfilled: ${reqs.join(", ")}`);
+            throw new Error(`The following action requests have not been fulfilled: ${reqs.join(', ')}`);
         }
         return null;
     };
     const throwIfHealthNotSatisfied = (packageId, healthCheckId) => {
-        const dep = find(packageId);
+        const dep = infoFor(packageId);
         if (healthCheckId &&
-            (dep.requirement.kind !== "running" ||
+            (dep.requirement.kind !== 'running' ||
                 !dep.requirement.healthChecks.includes(healthCheckId))) {
             throw new Error(`Unknown HealthCheckId ${healthCheckId}`);
         }
-        const errors = Object.entries(dep.result.healthChecks)
-            .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
-            .filter(([_, res]) => res.result !== "success");
+        const errors = dep.requirement.kind === 'running'
+            ? dep.requirement.healthChecks
+                .map((id) => [id, dep.result.healthChecks[id] ?? null])
+                .filter(([id, _]) => (healthCheckId ? id === healthCheckId : true))
+                .filter(([_, res]) => res?.result !== 'success')
+            : [];
         if (errors.length) {
             throw new Error(errors
-                .map(([_, e]) => `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ""}`)
-                .join("; "));
+                .map(([id, e]) => e
+                ? `Health Check ${e.name} of ${dep.result.title || packageId} failed with status ${e.result}${e.message ? `: ${e.message}` : ''}`
+                : `Health Check ${id} of ${dep.result.title} does not exist`)
+                .join('; '));
         }
         return null;
     };
@@ -106,7 +114,7 @@ async function checkDependencies(effects, packageIds) {
         throwIfInstalledNotSatisfied(packageId);
         throwIfInstalledVersionNotSatisfied(packageId);
         throwIfRunningNotSatisfied(packageId);
-        throwIfActionsNotSatisfied(packageId);
+        throwIfTasksNotSatisfied(packageId);
         throwIfHealthNotSatisfied(packageId);
         return null;
     };
@@ -125,21 +133,22 @@ async function checkDependencies(effects, packageIds) {
                 return [];
             });
             if (err.length) {
-                throw new Error(err.join("; "));
+                throw new Error(err.join('; '));
             }
             return null;
         })();
     return {
+        infoFor,
         installedSatisfied,
         installedVersionSatisfied,
         runningSatisfied,
-        actionsSatisfied,
+        tasksSatisfied,
         healthCheckSatisfied,
         satisfied,
         throwIfInstalledNotSatisfied,
         throwIfInstalledVersionNotSatisfied,
         throwIfRunningNotSatisfied,
-        throwIfActionsNotSatisfied,
+        throwIfTasksNotSatisfied,
         throwIfHealthNotSatisfied,
         throwIfNotSatisfied,
     };

package/base/lib/dependencies/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/dependencies.ts"],"names":[],"mappings":"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"}

package/base/lib/dependencies/setupDependencies.d.ts

@@ -1,14 +1,14 @@
-import * as T from "../types";
+import * as T from '../types';
 export type RequiredDependenciesOf<Manifest extends T.SDKManifest> = {
-    [K in keyof Manifest["dependencies"]]: Manifest["dependencies"][K]["optional"] extends false ? K : never;
-}[keyof Manifest["dependencies"]];
-export type OptionalDependenciesOf<Manifest extends T.SDKManifest> = Exclude<keyof Manifest["dependencies"], RequiredDependenciesOf<Manifest>>;
+    [K in keyof Manifest['dependencies']]: Exclude<Manifest['dependencies'][K], undefined>['optional'] extends false ? K : never;
+}[keyof Manifest['dependencies']];
+export type OptionalDependenciesOf<Manifest extends T.SDKManifest> = Exclude<keyof Manifest['dependencies'], RequiredDependenciesOf<Manifest>>;
 type DependencyRequirement = {
-    kind: "running";
+    kind: 'running';
     healthChecks: Array<T.HealthCheckId>;
     versionRange: string;
 } | {
-    kind: "exists";
+    kind: 'exists';
     versionRange: string;
 };
 export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
@@ -18,7 +18,5 @@ export type CurrentDependenciesResult<Manifest extends T.SDKManifest> = {
 };
 export declare function setupDependencies<Manifest extends T.SDKManifest>(fn: (options: {
     effects: T.Effects;
-}) => Promise<CurrentDependenciesResult<Manifest>>): (options: {
-    effects: T.Effects;
-}) => Promise<null>;
+}) => Promise<CurrentDependenciesResult<Manifest>>): (effects: T.Effects) => Promise<null>;
 export {};

package/base/lib/dependencies/setupDependencies.js

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupDependencies = setupDependencies;
-const util_1 = require("../util");
 const _checkType = null;
 function setupDependencies(fn) {
-    const cell = { updater: async (_) => null };
-    cell.updater = async (options) => {
-        const childEffects = options.effects.child("setupDependencies");
-        childEffects.constRetry = (0, util_1.once)(() => {
-            cell.updater({ effects: options.effects });
-        });
-        const dependencyType = await fn({ effects: childEffects });
-        return await options.effects.setDependencies({
+    return async (effects) => {
+        const dependencyType = await fn({ effects });
+        return await effects.setDependencies({
             dependencies: Object.entries(dependencyType)
                 .map(([k, v]) => [k, v])
                 .map(([id, { versionRange, ...x }]) => ({
@@ -21,6 +15,5 @@ function setupDependencies(fn) {
             })),
         });
     };
-    return cell.updater;
 }
 //# sourceMappingURL=setupDependencies.js.map

package/base/lib/dependencies/setupDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;AAmCA,8CA2BC;AA7DD,kCAA8B;AAuB9B,MAAM,UAAU,GAGZ,IAAI,CAAA;AAQR,SAAgB,iBAAiB,CAC/B,EAEkD;IAElD,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAyB,EAAE,EAAE,CAAC,IAAI,EAAE,CAAA;IACnE,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,OAA+B,EAAE,EAAE;QACvD,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAC/D,YAAY,CAAC,UAAU,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;QAEF,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAA;QAC1D,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;YAC3C,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAA0B,CAAU,CAAC;iBACzD,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAC/B,CAAC;gBACC,EAAE;gBACF,GAAG,CAAC;gBACJ,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;aACtC,CAA4B,CAChC;SACJ,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,OAAO,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC"}
+{"version":3,"file":"setupDependencies.js","sourceRoot":"","sources":["../../../../base/lib/dependencies/setupDependencies.ts"],"names":[],"mappings":";;AAsCA,8CAoBC;AA/BD,MAAM,UAAU,GAGZ,IAAI,CAAA;AAQR,SAAgB,iBAAiB,CAC/B,EAEkD;IAElD,OAAO,KAAK,EAAE,OAAkB,EAAE,EAAE;QAClC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;QAC5C,OAAO,MAAM,OAAO,CAAC,eAAe,CAAC;YACnC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAA0B,CAAU,CAAC;iBACzD,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAC/B,CAAC;gBACC,EAAE;gBACF,GAAG,CAAC;gBACJ,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;aACtC,CAA4B,CAChC;SACJ,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}

package/base/lib/exver/exver.d.ts

@@ -53,13 +53,13 @@ export interface TraceEvent {
 }
 export interface ParseOptions {
     filename?: string;
-    startRule?: "VersionRange" | "Or" | "And" | "VersionRangeAtom" | "Parens" | "Anchor" | "VersionSpec" | "FlavorAtom" | "Not" | "Any" | "None" | "CmpOp" | "ExtendedVersion" | "EmverVersionRange" | "EmverVersionRangeAtom" | "EmverParens" | "EmverAnchor" | "EmverNot" | "Emver" | "Flavor" | "Lowercase" | "String" | "Version" | "PreRelease" | "PreReleaseSegment" | "VersionNumber" | "Digit" | "_";
+    startRule?: "VersionRange" | "Or" | "And" | "VersionRangeAtom" | "Parens" | "Anchor" | "VersionSpec" | "FlavorAtom" | "Not" | "Any" | "None" | "CmpOp" | "ExtendedVersion" | "EmverVersionRange" | "EmverVersionRangeAtom" | "EmverParens" | "EmverAnchor" | "EmverNot" | "Emver" | "Flavor" | "FlavorString" | "String" | "Version" | "PreRelease" | "PreReleaseSegment" | "VersionNumber" | "Digit" | "_";
     tracer?: any;
     [key: string]: any;
 }
 export type ParseFunction = <Options extends ParseOptions>(input: string, options?: Options) => Options extends {
     startRule: infer StartRule;
-} ? StartRule extends "VersionRange" ? VersionRange : StartRule extends "Or" ? Or : StartRule extends "And" ? And : StartRule extends "VersionRangeAtom" ? VersionRangeAtom : StartRule extends "Parens" ? Parens : StartRule extends "Anchor" ? Anchor : StartRule extends "VersionSpec" ? VersionSpec : StartRule extends "FlavorAtom" ? FlavorAtom : StartRule extends "Not" ? Not : StartRule extends "Any" ? Any : StartRule extends "None" ? None : StartRule extends "CmpOp" ? CmpOp : StartRule extends "ExtendedVersion" ? ExtendedVersion : StartRule extends "EmverVersionRange" ? EmverVersionRange : StartRule extends "EmverVersionRangeAtom" ? EmverVersionRangeAtom : StartRule extends "EmverParens" ? EmverParens : StartRule extends "EmverAnchor" ? EmverAnchor : StartRule extends "EmverNot" ? EmverNot : StartRule extends "Emver" ? Emver : StartRule extends "Flavor" ? Flavor : StartRule extends "Lowercase" ? Lowercase_1 : StartRule extends "String" ? String_1 : StartRule extends "Version" ? Version : StartRule extends "PreRelease" ? PreRelease : StartRule extends "PreReleaseSegment" ? PreReleaseSegment : StartRule extends "VersionNumber" ? VersionNumber : StartRule extends "Digit" ? Digit : StartRule extends "_" ? _ : VersionRange : VersionRange;
+} ? StartRule extends "VersionRange" ? VersionRange : StartRule extends "Or" ? Or : StartRule extends "And" ? And : StartRule extends "VersionRangeAtom" ? VersionRangeAtom : StartRule extends "Parens" ? Parens : StartRule extends "Anchor" ? Anchor : StartRule extends "VersionSpec" ? VersionSpec : StartRule extends "FlavorAtom" ? FlavorAtom : StartRule extends "Not" ? Not : StartRule extends "Any" ? Any : StartRule extends "None" ? None : StartRule extends "CmpOp" ? CmpOp : StartRule extends "ExtendedVersion" ? ExtendedVersion : StartRule extends "EmverVersionRange" ? EmverVersionRange : StartRule extends "EmverVersionRangeAtom" ? EmverVersionRangeAtom : StartRule extends "EmverParens" ? EmverParens : StartRule extends "EmverAnchor" ? EmverAnchor : StartRule extends "EmverNot" ? EmverNot : StartRule extends "Emver" ? Emver : StartRule extends "Flavor" ? Flavor : StartRule extends "FlavorString" ? FlavorString : StartRule extends "String" ? String_1 : StartRule extends "Version" ? Version : StartRule extends "PreRelease" ? PreRelease : StartRule extends "PreReleaseSegment" ? PreReleaseSegment : StartRule extends "VersionNumber" ? VersionNumber : StartRule extends "Digit" ? Digit : StartRule extends "_" ? _ : VersionRange : VersionRange;
 export declare const parse: ParseFunction;
 export declare const PeggySyntaxError: typeof _PeggySyntaxError;
 export type PeggySyntaxError = _PeggySyntaxError;
@@ -90,7 +90,7 @@ export type VersionSpec = {
 };
 export type FlavorAtom = {
     type: "Flavor";
-    flavor: Lowercase_1;
+    flavor: FlavorString;
 };
 export type Not = {
     type: "Not";
@@ -141,8 +141,8 @@ export type Emver = {
         prerelease: [];
     };
 };
-export type Flavor = Lowercase_1;
-export type Lowercase_1 = string;
+export type Flavor = FlavorString;
+export type FlavorString = string;
 export type String_1 = string;
 export type Version = {
     number: VersionNumber;

package/base/lib/exver/exver.js

@@ -274,7 +274,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
         // @ts-ignore
         var peg$source = options.grammarSource;
         // @ts-ignore
-        var peg$startRuleFunctions = { VersionRange: peg$parseVersionRange, Or: peg$parseOr, And: peg$parseAnd, VersionRangeAtom: peg$parseVersionRangeAtom, Parens: peg$parseParens, Anchor: peg$parseAnchor, VersionSpec: peg$parseVersionSpec, FlavorAtom: peg$parseFlavorAtom, Not: peg$parseNot, Any: peg$parseAny, None: peg$parseNone, CmpOp: peg$parseCmpOp, ExtendedVersion: peg$parseExtendedVersion, EmverVersionRange: peg$parseEmverVersionRange, EmverVersionRangeAtom: peg$parseEmverVersionRangeAtom, EmverParens: peg$parseEmverParens, EmverAnchor: peg$parseEmverAnchor, EmverNot: peg$parseEmverNot, Emver: peg$parseEmver, Flavor: peg$parseFlavor, Lowercase: peg$parseLowercase, String: peg$parseString, Version: peg$parseVersion, PreRelease: peg$parsePreRelease, PreReleaseSegment: peg$parsePreReleaseSegment, VersionNumber: peg$parseVersionNumber, Digit: peg$parseDigit, _: peg$parse_ };
+        var peg$startRuleFunctions = { VersionRange: peg$parseVersionRange, Or: peg$parseOr, And: peg$parseAnd, VersionRangeAtom: peg$parseVersionRangeAtom, Parens: peg$parseParens, Anchor: peg$parseAnchor, VersionSpec: peg$parseVersionSpec, FlavorAtom: peg$parseFlavorAtom, Not: peg$parseNot, Any: peg$parseAny, None: peg$parseNone, CmpOp: peg$parseCmpOp, ExtendedVersion: peg$parseExtendedVersion, EmverVersionRange: peg$parseEmverVersionRange, EmverVersionRangeAtom: peg$parseEmverVersionRangeAtom, EmverParens: peg$parseEmverParens, EmverAnchor: peg$parseEmverAnchor, EmverNot: peg$parseEmverNot, Emver: peg$parseEmver, Flavor: peg$parseFlavor, FlavorString: peg$parseFlavorString, String: peg$parseString, Version: peg$parseVersion, PreRelease: peg$parsePreRelease, PreReleaseSegment: peg$parsePreReleaseSegment, VersionNumber: peg$parseVersionNumber, Digit: peg$parseDigit, _: peg$parse_ };
         // @ts-ignore
         var peg$startRuleFunction = peg$parseVersionRange;
         // @ts-ignore
@@ -1101,21 +1101,11 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             if (s1 !== peg$FAILED) {
                 // @ts-ignore
-                s2 = peg$parseLowercase();
+                s2 = peg$parseFlavorString();
                 // @ts-ignore
-                if (s2 !== peg$FAILED) {
-                    // @ts-ignore
-                    peg$savedPos = s0;
-                    // @ts-ignore
-                    s0 = peg$f3(s2);
-                    // @ts-ignore
-                }
-                else {
-                    // @ts-ignore
-                    peg$currPos = s0;
-                    // @ts-ignore
-                    s0 = peg$FAILED;
-                }
+                peg$savedPos = s0;
+                // @ts-ignore
+                s0 = peg$f3(s2);
                 // @ts-ignore
             }
             else {
@@ -2066,39 +2056,29 @@ const peggyParser = // Generated by Peggy 3.0.2.
             // @ts-ignore
             if (s1 !== peg$FAILED) {
                 // @ts-ignore
-                s2 = peg$parseLowercase();
+                s2 = peg$parseFlavorString();
                 // @ts-ignore
-                if (s2 !== peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 58) {
                     // @ts-ignore
-                    if (input.charCodeAt(peg$currPos) === 58) {
-                        // @ts-ignore
-                        s3 = peg$c4;
-                        // @ts-ignore
-                        peg$currPos++;
-                        // @ts-ignore
-                    }
-                    else {
-                        // @ts-ignore
-                        s3 = peg$FAILED;
-                        // @ts-ignore
-                        if (peg$silentFails === 0) {
-                            peg$fail(peg$e4);
-                        }
-                    }
+                    s3 = peg$c4;
                     // @ts-ignore
-                    if (s3 !== peg$FAILED) {
-                        // @ts-ignore
-                        peg$savedPos = s0;
-                        // @ts-ignore
-                        s0 = peg$f21(s2);
-                        // @ts-ignore
-                    }
-                    else {
-                        // @ts-ignore
-                        peg$currPos = s0;
-                        // @ts-ignore
-                        s0 = peg$FAILED;
+                    peg$currPos++;
+                    // @ts-ignore
+                }
+                else {
+                    // @ts-ignore
+                    s3 = peg$FAILED;
+                    // @ts-ignore
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e4);
                     }
+                }
+                // @ts-ignore
+                if (s3 !== peg$FAILED) {
+                    // @ts-ignore
+                    peg$savedPos = s0;
+                    // @ts-ignore
+                    s0 = peg$f21(s2);
                     // @ts-ignore
                 }
                 else {
@@ -2119,7 +2099,7 @@ const peggyParser = // Generated by Peggy 3.0.2.
             return s0;
         }
         // @ts-ignore
-        function peg$parseLowercase() {
+        function peg$parseFlavorString() {
             // @ts-ignore
             var s0, s1, s2;
             // @ts-ignore
@@ -2143,41 +2123,30 @@ const peggyParser = // Generated by Peggy 3.0.2.
                 }
             }
             // @ts-ignore
-            if (s2 !== peg$FAILED) {
+            while (s2 !== peg$FAILED) {
                 // @ts-ignore
-                while (s2 !== peg$FAILED) {
+                s1.push(s2);
+                // @ts-ignore
+                if (peg$r0.test(input.charAt(peg$currPos))) {
                     // @ts-ignore
-                    s1.push(s2);
+                    s2 = input.charAt(peg$currPos);
                     // @ts-ignore
-                    if (peg$r0.test(input.charAt(peg$currPos))) {
-                        // @ts-ignore
-                        s2 = input.charAt(peg$currPos);
-                        // @ts-ignore
-                        peg$currPos++;
-                        // @ts-ignore
-                    }
-                    else {
-                        // @ts-ignore
-                        s2 = peg$FAILED;
-                        // @ts-ignore
-                        if (peg$silentFails === 0) {
-                            peg$fail(peg$e17);
-                        }
+                    peg$currPos++;
+                    // @ts-ignore
+                }
+                else {
+                    // @ts-ignore
+                    s2 = peg$FAILED;
+                    // @ts-ignore
+                    if (peg$silentFails === 0) {
+                        peg$fail(peg$e17);
                     }
                 }
-                // @ts-ignore
-            }
-            else {
-                // @ts-ignore
-                s1 = peg$FAILED;
             }
             // @ts-ignore
-            if (s1 !== peg$FAILED) {
-                // @ts-ignore
-                peg$savedPos = s0;
-                // @ts-ignore
-                s1 = peg$f22();
-            }
+            peg$savedPos = s0;
+            // @ts-ignore
+            s1 = peg$f22();
             // @ts-ignore
             s0 = s1;
             // @ts-ignore