@spyglassmc/core 0.1.1 → 0.1.2

package/lib/common/TwoWayMap.d.ts

@@ -0,0 +1,21 @@
+export declare class TwoWayMap<K, V> implements Map<K, V> {
+    _map: Map<K, V>;
+    _reversedMap: Map<V, K>;
+    constructor(values?: [K, V][]);
+    get size(): number;
+    clear(): void;
+    delete(key: K): boolean;
+    deleteValue(value: V): boolean;
+    get(key: K): V | undefined;
+    getKey(value: V): K | undefined;
+    has(key: K): boolean;
+    hasValue(value: V): boolean;
+    set(key: K, value: V): this;
+    forEach(callbackfn: (value: V, key: K, map: TwoWayMap<K, V>) => void, thisArg?: any): void;
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+    [Symbol.iterator](): IterableIterator<[K, V]>;
+    [Symbol.toStringTag]: string;
+}
+//# sourceMappingURL=TwoWayMap.d.ts.map

package/lib/common/TwoWayMap.js

@@ -0,0 +1,75 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TwoWayMap = void 0;
+class TwoWayMap {
+    constructor(values = []) {
+        this._map = new Map();
+        this._reversedMap = new Map();
+        this[_a] = 'TwoWayMap';
+        for (const [k, v] of values) {
+            this._map.set(k, v);
+            this._reversedMap.set(v, k);
+        }
+    }
+    get size() {
+        return this._map.size;
+    }
+    clear() {
+        this._map.clear();
+        this._reversedMap.clear();
+    }
+    delete(key) {
+        const value = this._map.get(key);
+        const ans = this._map.delete(key);
+        if (value !== undefined) {
+            this._reversedMap.delete(value);
+        }
+        return ans;
+    }
+    deleteValue(value) {
+        const key = this._reversedMap.get(value);
+        const ans = this._reversedMap.delete(value);
+        if (key !== undefined) {
+            this._map.delete(key);
+        }
+        return ans;
+    }
+    get(key) {
+        return this._map.get(key);
+    }
+    getKey(value) {
+        return this._reversedMap.get(value);
+    }
+    has(key) {
+        return this._map.has(key);
+    }
+    hasValue(value) {
+        return this._reversedMap.has(value);
+    }
+    set(key, value) {
+        this._map.set(key, value);
+        this._reversedMap.set(value, key);
+        return this;
+    }
+    forEach(callbackfn, thisArg) {
+        for (const [key, value] of this._map) {
+            callbackfn.apply(thisArg, [value, key, this]);
+        }
+    }
+    entries() {
+        return this._map.entries();
+    }
+    keys() {
+        return this._map.keys();
+    }
+    values() {
+        return this._map.values();
+    }
+    [Symbol.iterator]() {
+        return this._map.entries();
+    }
+}
+exports.TwoWayMap = TwoWayMap;
+_a = Symbol.toStringTag;
+//# sourceMappingURL=TwoWayMap.js.map

package/lib/common/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/common/util.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import externalBinarySearch from 'binary-search';
-import type { URL as Uri } from 'url';
-import type { ProcessorContext, RootUriString } from '../service';
+import type { ProcessorContext } from '../service';
 export { URL as Uri } from 'url';
 /**
  * @param getCacheKey A function that takes the actual arguments being passed into the decorated method, and returns anything.
@@ -13,9 +12,9 @@ export { URL as Uri } from 'url';
  */
 export declare function CachePromise(getCacheKey?: (args: any[]) => any): MethodDecorator;
 /**
- * This is a decorator for async methods. Decorated methods will return the same `Promise` no matter what.
+ * This is a decorator for methods. Decorated methods will return the same non-`undefined` value no matter what.
  */
-export declare const SingletonPromise: MethodDecorator;
+export declare const Singleton: MethodDecorator;
 /**
  * @param getKey A function that takes the actual arguments being passed into the decorated method, and returns anything.
  * The result of this function will be used as the key to cache the `Timeout`. By default the first element in the argument
@@ -24,22 +23,6 @@ export declare const SingletonPromise: MethodDecorator;
  * Decorated methods will be scheduled to run after `ms` milliseconds. The timer will reset when the method is called again.
  */
 export declare function Delay(ms: number, getKey?: (args: any[]) => any): MethodDecorator;
-export declare namespace SpyglassUri {
-    const Protocol = "spyglassmc:";
-    namespace Archive {
-        const Hostname = "archive";
-        function get(archiveUri: string): RootUriString;
-        function get(archiveUri: string, pathInArchive: string): string;
-        function is(uri: Uri): boolean;
-        /**
-         * @throws When `uri` has the wrong protocol or hostname.
-         */
-        function decode(uri: Uri): {
-            archiveUri: string;
-            pathInArchive: string;
-        };
-    }
-}
 export declare type FullResourceLocation = `${string}:${string}`;
 export interface ResourceLocation {
     isTag: boolean;

package/lib/common/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIterable = exports.binarySearch = exports.getStates = exports.Lazy = exports.merge = exports.isObject = exports.parseGzippedJson = exports.zip = exports.unzip = exports.promisifyAsyncIterable = exports.TypePredicates = exports.Arrayable = exports.isEnoent = exports.isErrorCode = exports.getSha1 = exports.base64ToString = exports.stringToBase64 = exports.bufferToString = exports.ResourceLocation = exports.SpyglassUri = exports.Delay = exports.SingletonPromise = exports.CachePromise = exports.Uri = void 0;
+exports.isIterable = exports.binarySearch = exports.getStates = exports.Lazy = exports.merge = exports.isObject = exports.parseGzippedJson = exports.zip = exports.unzip = exports.promisifyAsyncIterable = exports.TypePredicates = exports.Arrayable = exports.isEnoent = exports.isErrorCode = exports.getSha1 = exports.base64ToString = exports.stringToBase64 = exports.bufferToString = exports.ResourceLocation = exports.Delay = exports.Singleton = exports.CachePromise = exports.Uri = void 0;
 const binary_search_1 = __importDefault(require("binary-search"));
 const crypto_1 = __importDefault(require("crypto"));
 const rfdc_1 = __importDefault(require("rfdc"));
@@ -39,18 +39,18 @@ function CachePromise(getCacheKey = args => args[0]) {
 }
 exports.CachePromise = CachePromise;
 /**
- * This is a decorator for async methods. Decorated methods will return the same `Promise` no matter what.
+ * This is a decorator for methods. Decorated methods will return the same non-`undefined` value no matter what.
  */
-const SingletonPromise = (_target, _key, descripter) => {
-    let promise;
+const Singleton = (_target, _key, descripter) => {
+    let value;
     const decoratedMethod = descripter.value;
     // The `function` syntax is used to preserve `this` context from the decorated method.
     descripter.value = function (...args) {
-        return promise ?? (promise = decoratedMethod.apply(this, args));
+        return value ?? (value = decoratedMethod.apply(this, args));
     };
     return descripter;
 };
-exports.SingletonPromise = SingletonPromise;
+exports.Singleton = Singleton;
 /**
  * @param getKey A function that takes the actual arguments being passed into the decorated method, and returns anything.
  * The result of this function will be used as the key to cache the `Timeout`. By default the first element in the argument
@@ -77,40 +77,6 @@ function Delay(ms, getKey = args => args[0]) {
     };
 }
 exports.Delay = Delay;
-var SpyglassUri;
-(function (SpyglassUri) {
-    SpyglassUri.Protocol = 'spyglassmc:';
-    let Archive;
-    (function (Archive) {
-        Archive.Hostname = 'archive';
-        function get(archiveUri, pathInArchive = '') {
-            return `${SpyglassUri.Protocol}//${Archive.Hostname}/${encodeURIComponent(archiveUri)}/${pathInArchive.replace(/\\/g, '/')}`;
-        }
-        Archive.get = get;
-        function is(uri) {
-            return uri.protocol === SpyglassUri.Protocol && uri.hostname === Archive.Hostname;
-        }
-        Archive.is = is;
-        /**
-         * @throws When `uri` has the wrong protocol or hostname.
-         */
-        function decode(uri) {
-            if (uri.protocol !== SpyglassUri.Protocol) {
-                throw new Error(`Expected protocol “${SpyglassUri.Protocol}” in “${uri.toString()}”`);
-            }
-            if (uri.hostname !== Archive.Hostname) {
-                throw new Error(`Expected hostname “${Archive.Hostname}” in “${uri.toString()}”`);
-            }
-            // Ex. `pathname`: `/QzpcYS50YXIuZ3o=/foo/bar.json`
-            const paths = uri.pathname.split('/');
-            return {
-                archiveUri: decodeURIComponent(paths[1]),
-                pathInArchive: paths.slice(2).join('/'),
-            };
-        }
-        Archive.decode = decode;
-    })(Archive = SpyglassUri.Archive || (SpyglassUri.Archive = {}));
-})(SpyglassUri = exports.SpyglassUri || (exports.SpyglassUri = {}));
 var ResourceLocation;
 (function (ResourceLocation) {
     /**

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/node/LiteralNode.d.ts

@@ -13,7 +13,7 @@ export interface LiteralNode extends LiteralBaseNode {
     readonly type: 'literal';
 }
 export declare namespace LiteralNode {
-    function is(obj: object): obj is LiteralNode;
+    function is(obj: object | undefined): obj is LiteralNode;
     function mock(range: RangeLike, options: LiteralOptions): LiteralNode;
 }
 //# sourceMappingURL=LiteralNode.d.ts.map

package/lib/node/LiteralNode.js

@@ -6,7 +6,7 @@ var LiteralNode;
 (function (LiteralNode) {
     /* istanbul ignore next */
     function is(obj) {
-        return obj.type === 'literal';
+        return obj?.type === 'literal';
     }
     LiteralNode.is = is;
     function mock(range, options) {

package/lib/node/ResourceLocationNode.d.ts

@@ -1,4 +1,5 @@
 import type { FullResourceLocation } from '../common';
+import { ResourceLocation } from '../common';
 import type { RangeLike } from '../source';
 import type { ResourceLocationCategory, SymbolAccessType, SymbolUsageType, TaggableResourceLocationCategory } from '../symbol';
 import type { AstNode } from './AstNode';
@@ -23,11 +24,8 @@ export declare type ResourceLocationOptions = {
     allowTag?: false;
     allowUnknown?: boolean;
 });
-export interface ResourceLocationBaseNode extends AstNode {
+export interface ResourceLocationBaseNode extends AstNode, Partial<ResourceLocation> {
     readonly options: ResourceLocationOptions;
-    readonly isTag?: boolean;
-    readonly namespace?: string;
-    readonly path?: string[];
 }
 export interface ResourceLocationNode extends ResourceLocationBaseNode {
     readonly type: 'resource_location';

package/lib/node/Sequence.d.ts

@@ -6,13 +6,14 @@ export interface SequenceNode<CN extends AstNode = AstNode> extends AstNode {
      */
     children: CN[];
 }
+export declare const SequenceUtilDiscriminator: unique symbol;
 /**
  * A utility object for temporarily storing a sequence rule.
  *
  * @template CN Child node.
  */
 export interface SequenceUtil<CN extends AstNode = AstNode> {
-    isSequenceUtil: true;
+    [SequenceUtilDiscriminator]: true;
     range: Range;
     children: CN[];
 }

package/lib/node/Sequence.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SequenceUtil = void 0;
+exports.SequenceUtil = exports.SequenceUtilDiscriminator = void 0;
+exports.SequenceUtilDiscriminator = Symbol('SequenceUtilDiscriminator');
 var SequenceUtil;
 (function (SequenceUtil) {
     function is(obj) {
-        return !!obj && obj.isSequenceUtil;
+        return !!obj && obj[exports.SequenceUtilDiscriminator];
     }
     SequenceUtil.is = is;
 })(SequenceUtil = exports.SequenceUtil || (exports.SequenceUtil = {}));

package/lib/node/SymbolNode.d.ts

@@ -15,7 +15,7 @@ export interface SymbolNode extends SymbolBaseNode {
     readonly type: 'symbol';
 }
 export declare namespace SymbolNode {
-    function is(obj: object): obj is SymbolNode;
+    function is(obj: AstNode | undefined): obj is SymbolNode;
     function mock(range: RangeLike, options: SymbolOptions): SymbolNode;
 }
 //# sourceMappingURL=SymbolNode.d.ts.map

package/lib/node/SymbolNode.js

@@ -6,7 +6,7 @@ var SymbolNode;
 (function (SymbolNode) {
     /* istanbul ignore next */
     function is(obj) {
-        return obj.type === 'symbol';
+        return obj?.type === 'symbol';
     }
     SymbolNode.is = is;
     function mock(range, options) {

package/lib/node/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parser/float.js

@@ -5,7 +5,7 @@ const locales_1 = require("@spyglassmc/locales");
 const source_1 = require("../source");
 const Parser_1 = require("./Parser");
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('float.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* Error */);
+    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('float.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
 };
 function float(options) {
     return (src, ctx) => {

package/lib/parser/index.js

@@ -2,7 +2,11 @@
 /* istanbul ignore file */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parser/integer.js

@@ -5,7 +5,7 @@ const locales_1 = require("@spyglassmc/locales");
 const source_1 = require("../source");
 const Parser_1 = require("./Parser");
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('integer.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* Error */);
+    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('integer.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
 };
 function integer(options) {
     return (src, ctx) => {

package/lib/parser/long.js

@@ -5,7 +5,7 @@ const locales_1 = require("@spyglassmc/locales");
 const source_1 = require("../source");
 const Parser_1 = require("./Parser");
 const fallbackOnOutOfRange = (ans, _src, ctx, options) => {
-    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('long.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* Error */);
+    ctx.err.report((0, locales_1.localize)('expected', (0, locales_1.localize)('long.between', options.min ?? '-∞', options.max ?? '+∞')), ans, 3 /* ErrorSeverity.Error */);
 };
 function long(options) {
     return (src, ctx) => {

package/lib/parser/string.js

@@ -20,9 +20,10 @@ function string(options) {
             const currentQuote = src.read();
             const contentStart = src.cursor;
             while (src.canRead() && src.peek() !== currentQuote) {
-                const cStart = src.cursor;
-                const c = src.read();
+                const c = src.peek();
                 if (options.escapable && c === '\\') {
+                    const cStart = src.cursor;
+                    src.skip();
                     const c2 = src.read();
                     if (c2 === '\\' || c2 === currentQuote || node_1.EscapeChar.is(options.escapable.characters, c2)) {
                         ans.valueMap.push({
@@ -62,6 +63,7 @@ function string(options) {
                     }
                 }
                 else {
+                    src.skip();
                     ans.value += c;
                 }
             }

package/lib/parser/util.d.ts

@@ -57,7 +57,9 @@ export declare function sequence<GN extends AstNode = never, PA extends SP<AstNo
  *
  * @returns A parser that takes a sequence with the passed-in parser being repeated zero or more times.
  */
-export declare function repeat<CN extends AstNode>(parser: InfallibleParser<CN | SequenceUtil<CN>>, parseGap?: InfallibleParser<CN[]>): void;
+export declare function repeat<CN extends AstNode>(parser: InfallibleParser<CN | SequenceUtil<CN>>, parseGap?: InfallibleParser<CN[]>): {
+    _inputParserIsInfallible: never;
+} & void;
 export declare function repeat<CN extends AstNode>(parser: Parser<CN | SequenceUtil<CN>>, parseGap?: InfallibleParser<CN[]>): InfallibleParser<SequenceUtil<CN>>;
 export interface AnyOutObject {
     /**
@@ -80,26 +82,41 @@ export declare function any<PA extends Parser<Returnable>[]>(parsers: PA, out?:
  * @returns A parser that fails when the passed-in parser didn't move the cursor at all.
  */
 export declare function failOnEmpty<T extends Returnable>(parser: Parser<T>): Parser<T>;
+/**
+ * @returns A parser that fails when the passed-in parser produced any errors.
+ */
+export declare function failOnError<T extends Returnable>(parser: Parser<T>): Parser<T>;
 /**
  * @returns A parser that takes an optional syntax component.
  */
-export declare function optional<N extends Returnable>(parser: InfallibleParser<N>): void;
+export declare function optional<N extends Returnable>(parser: InfallibleParser<N>): {
+    _inputParserIsInfallible: never;
+} & void;
 export declare function optional<N extends Returnable>(parser: Parser<N>): InfallibleParser<N | undefined>;
 /**
  * @param parser Must be fallible.
  *
  * @returns A parser that returns the return value of the `parser`, or the return value of `defaultValue` it it's a `Failure`.
  */
-export declare function recover<N extends Returnable>(parser: InfallibleParser<N>, defaultValue: (src: Source, ctx: ParserContext) => N): void;
+export declare function recover<N extends Returnable>(parser: InfallibleParser<N>, defaultValue: (src: Source, ctx: ParserContext) => N): {
+    _inputParserIsInfallible: never;
+} & void;
 export declare function recover<N extends Returnable>(parser: Parser<N>, defaultValue: (src: Source, ctx: ParserContext) => N): InfallibleParser<N>;
+declare type GettableParser = Parser<Returnable> | {
+    get: () => Parser<Returnable>;
+};
+declare type ExtractFromGettableParser<T extends GettableParser> = T extends {
+    get: () => infer V;
+} ? V : T extends Parser<Returnable> ? T : never;
 declare type Case = {
     predicate?: (this: void, src: ReadonlySource) => boolean;
-    parser: Parser<Returnable>;
+    prefix?: string;
+    parser: GettableParser;
 };
 /**
  * @template CA Case array.
  */
-export declare function select<CA extends readonly Case[]>(cases: CA): Parser<ExtractNodeType<CA[number]['parser']>>;
+export declare function select<CA extends readonly Case[]>(cases: CA): ExtractFromGettableParser<CA[number]['parser']> extends InfallibleParser<Returnable> ? InfallibleParser<ExtractNodeType<ExtractFromGettableParser<CA[number]['parser']>>> : Parser<ExtractNodeType<ExtractFromGettableParser<CA[number]['parser']>>>;
 /**
  * @returns A parser that returns the return value of `fn`.
  *
@@ -107,10 +124,10 @@ export declare function select<CA extends readonly Case[]>(cases: CA): Parser<Ex
  */
 export declare function map<NA extends Returnable, NB extends Returnable = NA>(parser: InfallibleParser<NA>, fn: (res: NA, src: Source, ctx: ParserContext) => NB): InfallibleParser<NB>;
 export declare function map<NA extends Returnable, NB extends Returnable = NA>(parser: Parser<NA>, fn: (res: NA, src: Source, ctx: ParserContext) => NB): Parser<NB>;
-export declare function setType<N extends AstNode, T extends string>(type: T, parser: InfallibleParser<N>): InfallibleParser<Omit<N, 'type'> & {
+export declare function setType<N extends Omit<AstNode, 'type'>, T extends string>(type: T, parser: InfallibleParser<N>): InfallibleParser<Omit<N, 'type'> & {
     type: T;
 }>;
-export declare function setType<N extends AstNode, T extends string>(type: T, parser: Parser<N>): Parser<Omit<N, 'type'> & {
+export declare function setType<N extends Omit<AstNode, 'type'>, T extends string>(type: T, parser: Parser<N>): Parser<Omit<N, 'type'> & {
     type: T;
 }>;
 /**
@@ -130,5 +147,6 @@ export declare function stopBefore<N extends Returnable>(parser: Parser<N>, ...t
  */
 export declare function acceptOnly<N extends Returnable>(parser: InfallibleParser<N>, ...characters: (string | readonly string[])[]): InfallibleParser<N>;
 export declare function acceptOnly<N extends Returnable>(parser: Parser<N>, ...characters: (string | readonly string[])[]): Parser<N>;
+export declare function acceptIf<P extends Parser<AstNode>>(parser: P, predicate: (this: void, char: string) => boolean): P extends InfallibleParser<infer N> ? InfallibleParser<N> : P extends Parser<infer N> ? Parser<N> : never;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/lib/parser/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.acceptOnly = exports.stopBefore = exports.validate = exports.setType = exports.map = exports.select = exports.recover = exports.optional = exports.failOnEmpty = exports.any = exports.repeat = exports.sequence = exports.attempt = void 0;
+exports.acceptIf = exports.acceptOnly = exports.stopBefore = exports.validate = exports.setType = exports.map = exports.select = exports.recover = exports.optional = exports.failOnError = exports.failOnEmpty = exports.any = exports.repeat = exports.sequence = exports.attempt = void 0;
 const node_1 = require("../node");
 const service_1 = require("../service");
 const source_1 = require("../source");
@@ -28,7 +28,7 @@ exports.attempt = attempt;
 function sequence(parsers, parseGap) {
     return (src, ctx) => {
         const ans = {
-            isSequenceUtil: true,
+            [node_1.SequenceUtilDiscriminator]: true,
             children: [],
             range: source_1.Range.create(src),
         };
@@ -62,7 +62,7 @@ exports.sequence = sequence;
 function repeat(parser, parseGap) {
     return (src, ctx) => {
         const ans = {
-            isSequenceUtil: true,
+            [node_1.SequenceUtilDiscriminator]: true,
             children: [],
             range: source_1.Range.create(src),
         };
@@ -122,12 +122,23 @@ function failOnEmpty(parser) {
     };
 }
 exports.failOnEmpty = failOnEmpty;
-function optional(parser) {
-    // return any<N | undefined>([
-    // 	parser,
-    // 	empty,
-    // ])
+/**
+ * @returns A parser that fails when the passed-in parser produced any errors.
+ */
+function failOnError(parser) {
     return (src, ctx) => {
+        const start = src.cursor;
+        const { errorAmount, updateSrcAndCtx, result } = attempt(parser, src, ctx);
+        if (!errorAmount) {
+            updateSrcAndCtx();
+            return result;
+        }
+        return Parser_1.Failure;
+    };
+}
+exports.failOnError = failOnError;
+function optional(parser) {
+    return ((src, ctx) => {
         const { result, updateSrcAndCtx } = attempt(parser, src, ctx);
         if (result === Parser_1.Failure) {
             return undefined;
@@ -136,7 +147,7 @@ function optional(parser) {
             updateSrcAndCtx();
             return result;
         }
-    };
+    });
 }
 exports.optional = optional;
 function recover(parser, defaultValue) {
@@ -152,12 +163,13 @@ function recover(parser, defaultValue) {
 exports.recover = recover;
 function select(cases) {
     return (src, ctx) => {
-        for (const { predicate, parser } of cases) {
-            if (predicate?.(src) ?? true) {
-                return parser(src, ctx);
+        for (const { predicate, prefix, parser } of cases) {
+            if (predicate?.(src) ?? (prefix !== undefined ? src.tryPeek(prefix) : undefined) ?? true) {
+                const callableParser = typeof parser === 'object' ? parser.get() : parser;
+                return callableParser(src, ctx);
             }
         }
-        return Parser_1.Failure;
+        throw new Error('The select parser util was called with non-exhaustive cases');
     };
 }
 exports.select = select;
@@ -173,10 +185,15 @@ function map(parser, fn) {
 }
 exports.map = map;
 function setType(type, parser) {
-    return map(parser, res => ({
-        ...res,
-        type,
-    }));
+    return map(parser, res => {
+        const { type: _type, ...restResult } = res;
+        const ans = {
+            type,
+            ...restResult,
+        };
+        delete ans[node_1.SequenceUtilDiscriminator];
+        return ans;
+    });
 }
 exports.setType = setType;
 function validate(parser, validator, message, severity) {
@@ -221,4 +238,20 @@ function acceptOnly(parser, ...characters) {
     };
 }
 exports.acceptOnly = acceptOnly;
+function acceptIf(parser, predicate) {
+    return ((src, ctx) => {
+        const tmpSrc = src.clone();
+        // Cut tmpSrc.string before the nearest unacceptable character.
+        for (let i = tmpSrc.innerCursor; i < tmpSrc.string.length; i++) {
+            if (!predicate(tmpSrc.string.charAt(i))) {
+                tmpSrc.string = tmpSrc.string.slice(0, i);
+                break;
+            }
+        }
+        const ans = parser(tmpSrc, ctx);
+        src.innerCursor = tmpSrc.innerCursor;
+        return ans;
+    });
+}
+exports.acceptIf = acceptIf;
 //# sourceMappingURL=util.js.map

package/lib/processor/checker/builtin.js

@@ -74,7 +74,7 @@ const resourceLocation = (node, ctx) => {
     const full = node_1.ResourceLocationNode.toString(node, 'full');
     if (node.options.pool) {
         if (!node.options.pool.includes(full)) {
-            ctx.err.report((0, lib_1.localize)('expected', node.options.pool), node, 3 /* Error */);
+            ctx.err.report((0, lib_1.localize)('expected', node.options.pool), node, 3 /* ErrorSeverity.Error */);
         }
         return;
     }

package/lib/processor/checker/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/processor/colorizer/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];