astn 0.97.0 → 0.98.0

package/dist/esc/bin/normalizeFile.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const normalizeText_1 = require("../legacy/notSureYet/normalizeText");
+const implementation_1 = require("../../modules/etc/esc/implementation");
+implementation_1.runProgram(normalizeText_1.normalize);

package/dist/esc/bin/toJSON.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const toJSON_1 = require("../legacy/notSureYet/toJSON");
+const implementation_1 = require("../../modules/etc/esc/implementation");
+implementation_1.runProgram(toJSON_1.toJSON);

package/dist/{pub/esc → esc}/legacy/notSureYet/formatCLI.d.ts

@@ -1,5 +1,5 @@
-import * as etc from "../../interfaces/etc";
-import * as tokenLevel from "../../interfaces/tokenLevel";
-import * as grammar from "../../interfaces/grammar";
-import * as astn from "../../interfaces/astn";
+import * as etc from "../../../modules/etc";
+import * as tokenLevel from "../../../modules/tokenLevel";
+import * as grammar from "../../../modules/grammar";
+import * as astn from "../../../modules/astn";
 export declare function formatCLI(write: (str: string) => void, onError: (str: string) => void, createFormatter: ($: astn.CreateFormatterParameters<tokenLevel.TokenizerAnnotationData>) => grammar.IStructureHandler<tokenLevel.TokenizerAnnotationData>): etc.IStreamConsumer<string, null>;

package/dist/esc/legacy/notSureYet/formatCLI.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const astn_1 = require("../../../modules/astn");
+const astn_2 = require("../../../modules/astn");
+const astn_3 = require("../../../modules/astn");
+const astn_4 = require("../../../modules/astn");
+const astn_5 = require("../../../modules/astn");
+function formatCLI(write, onError, createFormatter) {
+    return astn_4.createTokenizer({
+        parser: astn_5.createStructureParser({
+            handler: createFormatter({
+                indentationString: "    ",
+                newline: "\r\n",
+                write: (str) => {
+                    write(str);
+                },
+                onError: ($) => {
+                    onError(`${astn_1.printParsingError($.error)} @ ${astn_3.printRange($.annotation.range)}`);
+                },
+            }),
+            onError: ($) => {
+                onError(`${astn_1.printParsingError($.error)} @ ${astn_3.printRange($.annotation.range)}`);
+            },
+        }),
+        onError: ($) => {
+            onError(`${astn_2.printTokenizerError($.error)} @ ${astn_3.printRange($.range)}`);
+        },
+    });
+}
+exports.formatCLI = formatCLI;

package/dist/{pub/esc → esc}/legacy/notSureYet/normalizeText.d.ts

@@ -1,2 +1,2 @@
-import * as etc from "../../interfaces/etc";
+import * as etc from "../../../modules/etc";
 export declare const normalize: etc.CreateStreamConsumer;

package/dist/esc/legacy/notSureYet/normalizeText.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const astn_1 = require("../../../modules/astn");
+const formatCLI_1 = require("./formatCLI");
+exports.normalize = (write, onError) => {
+    return formatCLI_1.formatCLI(write, onError, astn_1.createASTNSerializer);
+};

package/dist/{pub/esc → esc}/legacy/notSureYet/toJSON.d.ts

@@ -1,2 +1,2 @@
-import * as etc from "../../interfaces/etc";
+import * as etc from "../../../modules/etc";
 export declare const toJSON: etc.CreateStreamConsumer;

package/dist/esc/legacy/notSureYet/toJSON.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const astn_1 = require("../../../modules/astn");
+const formatCLI_1 = require("./formatCLI");
+exports.toJSON = (write, onError) => {
+    return formatCLI_1.formatCLI(write, onError, astn_1.createJSONSerializer);
+};

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/IChunk.d.ts

@@ -1,6 +1,6 @@
-export interface IChunk {
+export declare type IChunk = {
     lookahead(): number | null;
     getCurrentIndex(): number;
     getString(): string;
     increaseIndex(): void;
-}
+};

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/ILocationState.d.ts

@@ -1,6 +1,6 @@
-import * as tokenLevel from "../../interfaces/tokenLevel";
-export interface ILocationState {
+import * as tokenLevel from "../../../tokenLevel/interface";
+export declare type ILocationState = {
     getCurrentLocation(): tokenLevel.Location;
     getNextLocation(): tokenLevel.Location;
     increase(character: number): void;
-}
+};

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/IPreTokenStreamConsumer.d.ts

@@ -1,4 +1,4 @@
-import * as etc from "../../interfaces/etc";
-import * as tokenLevel from "../../interfaces/tokenLevel";
+import * as etc from "../../../etc/interface";
+import * as tokenLevel from "../../../tokenLevel/interface";
 import { PreToken } from "./PreToken";
 export declare type IPreTokenStreamConsumer = etc.IStreamConsumer<PreToken, tokenLevel.Location>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/IPreTokenizer.d.ts

@@ -4,11 +4,11 @@ export declare type TokenReturnType = {
     consumeCharacter: boolean;
     preToken: null | PreToken;
 };
-export interface ILoopState {
+export declare type ILoopState = {
     ensureFlushed(callback: () => TokenReturnType): TokenReturnType;
     whileLoop(callback: (nextChar: number) => TokenReturnType): PreToken | null;
-}
-export interface IPreTokenizer {
+};
+export declare type IPreTokenizer = {
     handleDanglingToken(): PreToken | null;
     createNextToken(loopState: ILoopState): null | PreToken;
-}
+};

package/dist/modules/astn/esc/implementation/PreToken.d.ts

@@ -0,0 +1,44 @@
+import * as grammar from "../../../grammar/interface";
+import * as tokenLevel from "../../../tokenLevel/interface";
+export declare type WrappedStringType = ["apostrophe", {}] | ["quote", {}] | ["multiline", {
+    previousLines: string[];
+}];
+/**
+ * A PreToken is a low level token
+ */
+export declare type PreToken = {
+    type: ["header start", {
+        range: tokenLevel.Range;
+    }] | ["block comment begin", {
+        range: tokenLevel.Range;
+    }] | ["block comment end", {
+        range: tokenLevel.Range;
+    }] | ["line comment begin", {
+        range: tokenLevel.Range;
+    }] | ["line comment end", {
+        location: tokenLevel.Location;
+    }] | ["newline", {
+        range: tokenLevel.Range;
+    }] | ["structural", {
+        type: grammar.StructuralTokenType;
+        range: tokenLevel.Range;
+    }] | ["wrapped string begin", {
+        range: tokenLevel.Range;
+        type: WrappedStringType;
+    }] | ["wrapped string end", {
+        range: tokenLevel.Range;
+        wrapper: string | null;
+    }] | ["snippet", {
+        chunk: string;
+        begin: number;
+        end: number;
+    }] | ["non wrapped string begin", {
+        location: tokenLevel.Location;
+    }] | ["non wrapped string end", {
+        location: tokenLevel.Location;
+    }] | ["whitespace begin", {
+        location: tokenLevel.Location;
+    }] | ["whitespace end", {
+        location: tokenLevel.Location;
+    }];
+};

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createASTNNormalizer.d.ts

@@ -1,5 +1,5 @@
-import * as grammar from "../../interfaces/grammar";
-import * as tokenLevel from "../../interfaces/tokenLevel";
+import * as grammar from "../../../grammar/interface";
+import * as tokenLevel from "../../../tokenLevel/interface";
 export declare function createASTNNormalizer<EventAnnotation>($: {
     indentationString: string;
     newline: string;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createASTNNormalizer.js

@@ -1,29 +1,14 @@
 "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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createASTNNormalizer = void 0;
+const pr = __importStar(require("pareto-runtime"));
 const stringSerialization = __importStar(require("./stringSerialization"));
-function assertUnreachable(_x) {
-    throw new Error("unreachable");
-}
 function createASTNNormalizer($, $p) {
     function createIndentation(context) {
         const depth = context.dictionaryDepth + context.verboseGroupDepth + context.listDepth;
@@ -53,7 +38,7 @@ function createASTNNormalizer($, $p) {
                             return stringSerialization.createSerializedQuotedString($.propertyToken.token.value);
                         }
                         default:
-                            return assertUnreachable($.objectToken.token.type[0]);
+                            return pr.au($.objectToken.token.type[0]);
                     }
                 })(),
                 stringAfter: `: `,
@@ -104,7 +89,7 @@ function createASTNNormalizer($, $p) {
                         return stringSerialization.createSerializedApostrophedString($.value);
                     }
                     default:
-                        return assertUnreachable($.wrapping[0]);
+                        return pr.au($.wrapping[0]);
                 }
             }
             $p.writer.token({

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createASTNSerializer.d.ts

@@ -1,3 +1,3 @@
-import * as astn from "../../interfaces/astn";
-import * as grammar from "../../interfaces/grammar";
+import * as astn from "../../interface";
+import * as grammar from "../../../grammar/interface";
 export declare function createASTNSerializer<EventAnnotation>($: astn.CreateFormatterParameters<EventAnnotation>): grammar.IStructureHandler<EventAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createASTNSerializer.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createASTNSerializer = void 0;
 const createAnnotater_1 = require("./createAnnotater");
 const createASTNNormalizer_1 = require("./createASTNNormalizer");
 const createTreeParser_1 = require("./createTreeParser");
@@ -19,7 +18,7 @@ function createASTNSerializer($) {
         onNoInternalSchema: () => { },
         onEmbeddedSchema: (_range) => {
             $.write(`! `);
-            return (0, createAnnotater_1.createAnnotater)((0, createASTNNormalizer_1.createASTNNormalizer)({
+            return createAnnotater_1.createAnnotater(createASTNNormalizer_1.createASTNNormalizer({
                 indentationString: $.indentationString,
                 newline: $.newline,
             }, {
@@ -30,8 +29,8 @@ function createASTNSerializer($) {
             $.write(`! ${$$.token.token.value}${$.newline}`);
         },
         onBody: () => {
-            const x = (0, createTreeParser_1.createTreeParser)({
-                handler: (0, createAnnotater_1.createAnnotater)((0, createASTNNormalizer_1.createASTNNormalizer)({
+            const x = createTreeParser_1.createTreeParser({
+                handler: createAnnotater_1.createAnnotater(createASTNNormalizer_1.createASTNNormalizer({
                     indentationString: $.indentationString,
                     newline: $.newline,
                 }, {

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createAnnotater.d.ts

@@ -1,2 +1,2 @@
-import * as grammar from "../../interfaces/grammar";
+import * as grammar from "../../../grammar/interface";
 export declare function createAnnotater<InTokenAnnotation>(handler: grammar.IAnnotatedHandler<InTokenAnnotation>): grammar.ITreeHandler<InTokenAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createAnnotater.js

@@ -1,12 +1,16 @@
 "use strict";
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAnnotater = void 0;
+const pr = __importStar(require("pareto-runtime"));
 // import * as tokenLevel from "../../interfaces/tokenLevel"
 // import * as typed from "../../interfaces/typed"
 // import * as typedTokenize from "../../interfaces/typedTokenize"
-function assertUnreachable(_x) {
-    throw new Error("unreachable");
-}
 function createAnnotater(handler) {
     let dictionaryDepth = 0;
     let verboseGroupDepth = 0;
@@ -35,7 +39,7 @@ function createAnnotater(handler) {
                         break;
                     }
                     default:
-                        assertUnreachable($.token.token.type[0]);
+                        pr.au($.token.token.type[0]);
                 }
                 handler.objectBegin({
                     token: $.token,
@@ -65,7 +69,7 @@ function createAnnotater(handler) {
                                 break;
                             }
                             default:
-                                assertUnreachable($.token.token.type[0]);
+                                pr.au($.token.token.type[0]);
                         }
                         handler.objectEnd({
                             openToken: $.token,
@@ -87,7 +91,7 @@ function createAnnotater(handler) {
                         break;
                     }
                     default:
-                        assertUnreachable($.token.token.type[0]);
+                        pr.au($.token.token.type[0]);
                 }
                 handler.arrayBegin({
                     token: $.token,
@@ -116,7 +120,7 @@ function createAnnotater(handler) {
                                 break;
                             }
                             default:
-                                assertUnreachable($.token.token.type[0]);
+                                pr.au($.token.token.type[0]);
                         }
                         handler.arrayEnd({
                             openToken: $.token,

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createExpectContext.d.ts

@@ -1,5 +1,5 @@
-import * as grammar from "../../interfaces/grammar";
-import * as astn from "../../interfaces/astn";
+import * as grammar from "../../../grammar/interface";
+import * as astn from "../../interface";
 export declare function createExpectContext<EventAnnotation>($p: {
     issueHandler: astn.OnExpectIssue<EventAnnotation>;
     createDummyValueHandler: () => grammar.IValueHandler<EventAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createExpectContext.js

@@ -1,31 +1,15 @@
 "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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExpectContext = void 0;
 /* eslint
 */
 const pr = __importStar(require("pareto-runtime"));
-function assertUnreachable(_x) {
-    throw new Error("unreachable");
-}
 function createCreateContext(issueHandler, createDummyValueHandler, duplicateEntrySeverity, onDuplicateEntry) {
     function raiseWarning(issue, annotation) {
         issueHandler({
@@ -71,7 +55,7 @@ function createCreateContext(issueHandler, createDummyValueHandler, duplicateEnt
                                         raiseWarning(["duplicate entry", { key: propertyData.token.token.value }], propertyData.token.annotation);
                                         break;
                                     default:
-                                        assertUnreachable(duplicateEntrySeverity[0]);
+                                        pr.au(duplicateEntrySeverity[0]);
                                 }
                                 switch (onDuplicateEntry[0]) {
                                     case "ignore":
@@ -79,7 +63,7 @@ function createCreateContext(issueHandler, createDummyValueHandler, duplicateEnt
                                     case "overwrite":
                                         return onEntry(propertyData);
                                     default:
-                                        return assertUnreachable(onDuplicateEntry[0]);
+                                        return pr.au(onDuplicateEntry[0]);
                                 }
                             }
                             else {
@@ -143,7 +127,7 @@ function createCreateContext(issueHandler, createDummyValueHandler, duplicateEnt
                                         raiseWarning(["duplicate property", { name: $$.token.token.value }], $$.token.annotation);
                                         break;
                                     default:
-                                        return assertUnreachable(duplicateEntrySeverity[0]);
+                                        return pr.au(duplicateEntrySeverity[0]);
                                 }
                                 switch (onDuplicateEntry[0]) {
                                     case "ignore":
@@ -151,7 +135,7 @@ function createCreateContext(issueHandler, createDummyValueHandler, duplicateEnt
                                     case "overwrite":
                                         return onProperty();
                                     default:
-                                        return assertUnreachable(onDuplicateEntry[0]);
+                                        return pr.au(onDuplicateEntry[0]);
                                 }
                             }
                             else {

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createFlattener.d.ts

@@ -1,2 +1,2 @@
-import * as grammar from "../../interfaces/grammar";
+import * as grammar from "../../../grammar/interface";
 export declare function createFlattener<EventAnnotation>(parser: grammar.IContentParser<EventAnnotation>): grammar.ITreeHandler<EventAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createFlattener.js

@@ -1,12 +1,13 @@
 "use strict";
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFlattener = void 0;
-function assertUnreachable(_x) {
-    throw new Error("unreachable");
-}
-// function cc<T, RT>(input: T, callback: (output: T) => RT): RT {
-//     return callback(input)
-// }
+const pr = __importStar(require("pareto-runtime"));
 function createFlattener(parser) {
     function createLoggingRequiredValueHandler() {
         return {
@@ -32,7 +33,7 @@ function createFlattener(parser) {
                         case "quote":
                             return ["quote", {}];
                         default:
-                            return assertUnreachable($.token.wrapping[0]);
+                            return pr.au($.token.wrapping[0]);
                     }
                 })(),
             }], $.annotation);
@@ -49,7 +50,7 @@ function createFlattener(parser) {
                                 case "shorthand group":
                                     return ["open shorthand group", {}];
                                 default:
-                                    return assertUnreachable($.token.token.type[0]);
+                                    return pr.au($.token.token.type[0]);
                             }
                         })(),
                     }], $.token.annotation);
@@ -66,7 +67,7 @@ function createFlattener(parser) {
                                         case "shorthand group":
                                             return ["close shorthand group", {}];
                                         default:
-                                            return assertUnreachable(open$.token.token.type[0]);
+                                            return pr.au(open$.token.token.type[0]);
                                     }
                                 })(),
                             }], $.token.annotation);
@@ -83,7 +84,7 @@ function createFlattener(parser) {
                                 case "verbose group":
                                     return ["open verbose group", {}];
                                 default:
-                                    return assertUnreachable($.token.token.type[0]);
+                                    return pr.au($.token.token.type[0]);
                             }
                         })(),
                     }], $.token.annotation);
@@ -101,7 +102,7 @@ function createFlattener(parser) {
                                         case "verbose group":
                                             return ["close verbose group", {}];
                                         default:
-                                            return assertUnreachable(open$.token.token.type[0]);
+                                            return pr.au(open$.token.token.type[0]);
                                     }
                                 })(),
                             }], $.token.annotation);

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createJSONFormatter.d.ts

@@ -1,3 +1,3 @@
-import * as grammar from "../../interfaces/grammar";
-import * as tokenLevel from "../../interfaces/tokenLevel";
+import * as grammar from "../../../grammar/interface";
+import * as tokenLevel from "../../../tokenLevel/interface";
 export declare function createJSONFormatter<EventAnnotation>(indentationString: string, newline: string, writer: tokenLevel.IFormatInstructionWriter<EventAnnotation>): grammar.IAnnotatedHandler<EventAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createJSONFormatter.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createJSONFormatter = void 0;
+const pr = __importStar(require("pareto-runtime"));
 const stringSerialization_1 = require("./stringSerialization");
-function assertUnreachable(_x) {
-    throw new Error("unreachable");
-}
 function createJSONFormatter(indentationString, newline, writer) {
     function createIndentation(context) {
         let indentation = ``;
@@ -24,7 +28,7 @@ function createJSONFormatter(indentationString, newline, writer) {
         property: ($) => {
             writer.token({
                 stringBefore: `${$.isFirst ? "" : ","}${newline}${createIndentation($.stackContext)}`,
-                token: (0, stringSerialization_1.createSerializedQuotedString)($.propertyToken.token.value),
+                token: stringSerialization_1.createSerializedQuotedString($.propertyToken.token.value),
                 stringAfter: `: `,
             }, $.propertyToken.annotation);
         },
@@ -68,16 +72,16 @@ function createJSONFormatter(indentationString, newline, writer) {
                             // if (isNaN(nr)) {
                             //     return createSerializedQuotedString($.token.data.value)
                             // }
-                            return (0, stringSerialization_1.createSerializedNonWrappedString)($.token.token.value);
+                            return stringSerialization_1.createSerializedNonWrappedString($.token.token.value);
                         }
                         case "quote": {
-                            return (0, stringSerialization_1.createSerializedQuotedString)($.token.token.value);
+                            return stringSerialization_1.createSerializedQuotedString($.token.token.value);
                         }
                         case "apostrophe": {
-                            return (0, stringSerialization_1.createSerializedQuotedString)($.token.token.value);
+                            return stringSerialization_1.createSerializedQuotedString($.token.token.value);
                         }
                         default:
-                            return assertUnreachable($.token.token.wrapping[0]);
+                            return pr.au($.token.token.wrapping[0]);
                     }
                 })(),
                 stringAfter: ``,
@@ -86,7 +90,7 @@ function createJSONFormatter(indentationString, newline, writer) {
         multilineStringValue: ($) => {
             writer.token({
                 stringBefore: ``,
-                token: (0, stringSerialization_1.createSerializedQuotedString)($.token.token.lines.join(newline)),
+                token: stringSerialization_1.createSerializedQuotedString($.token.token.lines.join(newline)),
                 stringAfter: ``,
             }, $.token.annotation);
         },
@@ -100,7 +104,7 @@ function createJSONFormatter(indentationString, newline, writer) {
         option: ($) => {
             writer.token({
                 stringBefore: ` `,
-                token: (0, stringSerialization_1.createSerializedQuotedString)($.token.token.value),
+                token: stringSerialization_1.createSerializedQuotedString($.token.token.value),
                 stringAfter: `, `,
             }, $.token.annotation);
         },

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createJSONSerializer.d.ts

@@ -1,3 +1,3 @@
-import * as astn from "../../interfaces/astn";
-import * as grammar from "../../interfaces/grammar";
+import * as astn from "../../interface";
+import * as grammar from "../../../grammar/interface";
 export declare function createJSONSerializer<EventAnnotation>($: astn.CreateFormatterParameters<EventAnnotation>): grammar.IStructureHandler<EventAnnotation>;

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createJSONSerializer.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createJSONSerializer = void 0;
 const createAnnotater_1 = require("./createAnnotater");
 const dummyHandlers_1 = require("./dummyHandlers");
 const createJSONFormatter_1 = require("./createJSONFormatter");
@@ -9,12 +8,12 @@ function createJSONSerializer($) {
     return {
         onNoInternalSchema: () => { },
         onEmbeddedSchema: (_range) => {
-            return (0, dummyHandlers_1.createDummyTreeHandler)();
+            return dummyHandlers_1.createDummyTreeHandler();
         },
         onSchemaReference: () => { },
         onBody: () => {
-            const x = (0, createTreeParser_1.createTreeParser)({
-                handler: (0, createAnnotater_1.createAnnotater)((0, createJSONFormatter_1.createJSONFormatter)($.indentationString, $.newline, {
+            const x = createTreeParser_1.createTreeParser({
+                handler: createAnnotater_1.createAnnotater(createJSONFormatter_1.createJSONFormatter($.indentationString, $.newline, {
                     token: (instruction) => {
                         $.write(instruction.stringBefore);
                         $.write(instruction.token);

package/dist/{pub/esc/implementations/_astn → modules/astn/esc/implementation}/createPreTokenizer.d.ts

@@ -1,5 +1,5 @@
-import * as astn from "../../interfaces/astn";
-import * as tokenLevel from "../../interfaces/tokenLevel";
+import * as astn from "../../interface";
+import * as tokenLevel from "../../../tokenLevel/interface";
 import { IPreTokenizer } from "./IPreTokenizer";
 import { ILocationState } from "./ILocationState";
 declare type OnError = ($: {