astn-core 0.5.87 → 0.5.89

package/dist/implementation/manual/transformers/location/fountain_pen.d.ts

@@ -3,9 +3,9 @@ import * as d_in from "../../../../interface/generated/liana/schemas/location/da
 import * as d_out from "pareto-fountain-pen/dist/interface/generated/liana/schemas/prose/data";
 import * as d_function from "../../../../interface/to_be_generated/location_to_fountain_pen";
 export declare namespace signatures {
-    type Location = _pi.Transformer_With_Parameter<d_in.Location, d_out.Phrase, d_function.Old_Parameters>;
-    type Range = _pi.Transformer_With_Parameter<d_in.Range, d_out.Phrase, d_function.Old_Parameters>;
-    type Possible_Range = _pi.Transformer_With_Parameter<d_in.Possible_Range, d_out.Phrase, d_function.Old_Parameters>;
+    type Location = _pi.Transformer_With_Parameter<d_in.Location, d_out.Phrase, d_function.Parameters>;
+    type Range = _pi.Transformer_With_Parameter<d_in.Range, d_out.Phrase, d_function.Parameters>;
+    type Possible_Range = _pi.Transformer_With_Parameter<d_in.Possible_Range, d_out.Phrase, d_function.Parameters>;
 }
 export declare const Range: signatures.Range;
 export declare const Possible_Range: signatures.Possible_Range;

package/dist/implementation/manual/transformers/location/fountain_pen.js

@@ -45,8 +45,6 @@ const temp_serialize_number = (n) => {
     return (0, _p_list_from_text_1.default)(`${n}`, ($) => $);
 };
 const Range = ($, $p) => sh.ph.composed([
-    sh.ph.literal($p['document resource identifier']),
-    sh.ph.literal(":"),
     sh.ph.serialize(temp_serialize_number($.start.relative.line + _p.decide.state($p['character location reporting'], ($) => ($[0] === 'zero based' ? 0 : 1)))),
     sh.ph.literal(":"),
     sh.ph.serialize(temp_serialize_number($.start.relative.column + _p.decide.state($p['character location reporting'], ($) => ($[0] === 'zero based' ? 0 : 1)))),
@@ -59,22 +57,17 @@ exports.Range = Range;
 const Possible_Range = ($, $p) => _p.decide.state($, ($) => {
     switch ($[0]) {
         case 'range': return _p.ss($, ($) => (0, exports.Range)($, $p));
-        case 'end of document': return _p.ss($, ($) => sh.ph.composed([
-            sh.ph.literal($p['document resource identifier']),
-            sh.ph.literal(":0:0"),
-        ]));
+        case 'end of document': return _p.ss($, ($) => (0, exports.Location)($.end, $p));
         default: return _p.au($[0]);
     }
 });
 exports.Possible_Range = Possible_Range;
 const Location = ($, $p) => {
     return sh.ph.composed([
-        sh.ph.literal($p['document resource identifier']),
-        sh.ph.literal(":"),
         sh.ph.serialize(temp_serialize_number($.relative.line + _p.decide.state($p['character location reporting'], ($) => ($[0] === 'zero based' ? 0 : 1)))),
         sh.ph.literal(":"),
         sh.ph.serialize(temp_serialize_number($.relative.column + _p.decide.state($p['character location reporting'], ($) => ($[0] === 'zero based' ? 0 : 1)))),
     ]);
 };
 exports.Location = Location;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm91bnRhaW5fcGVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2ltcGxlbWVudGF0aW9uL21hbnVhbC90cmFuc2Zvcm1lcnMvbG9jYXRpb24vZm91bnRhaW5fcGVuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE2QztBQUU3QywyRkFBa0U7QUFTbEUsWUFBWTtBQUNaLDhFQUErRDtBQVcvRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsQ0FBUyxFQUFrQyxFQUFFO0lBQ3hFLE9BQU8sSUFBQSwyQkFBaUIsRUFBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUM5QyxDQUFDLENBQUE7QUFFTSxNQUFNLEtBQUssR0FBcUIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQztJQUM3RCxFQUFFLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsOEJBQThCLENBQUMsQ0FBQztJQUNqRCxFQUFFLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7SUFDbEIsRUFBRSxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyw4QkFBOEIsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzNKLEVBQUUsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm91bnRhaW5fcGVuLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2ltcGxlbWVudGF0aW9uL21hbnVhbC90cmFuc2Zvcm1lcnMvbG9jYXRpb24vZm91bnRhaW5fcGVuLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDREQUE2QztBQUU3QywyRkFBa0U7QUFTbEUsWUFBWTtBQUNaLDhFQUErRDtBQVcvRCxNQUFNLHFCQUFxQixHQUFHLENBQUMsQ0FBUyxFQUFrQyxFQUFFO0lBQ3hFLE9BQU8sSUFBQSwyQkFBaUIsRUFBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUM5QyxDQUFDLENBQUE7QUFFTSxNQUFNLEtBQUssR0FBcUIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsQ0FBQztJQUM3RCxFQUFFLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLDhCQUE4QixDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDM0osRUFBRSxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDO0lBQ2xCLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxFQUFFLENBQUMs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

package/dist/interface/to_be_generated/location_to_fountain_pen.d.ts

@@ -1,5 +1,4 @@
-export type Old_Parameters = {
+export type Parameters = {
     'character location reporting': character_location_reporting;
-    'document resource identifier': string;
 };
 export type character_location_reporting = ['zero based', null] | ['one based', null];

package/dist/temp_core/new_interface_signatures.d.ts

@@ -1,9 +1,25 @@
 import * as _pi from 'pareto-core/dist/interface';
-export type Iterator<Iterator_Element, Choice, End_Info> = {
-    list: <List_Element, Out>(has_more_elements: ($: Iterator_Element) => boolean, handle: ($: Iterator_Element) => List_Element, wrap_up: (list: _pi.List<List_Element>) => Out) => Out;
-    expect: <T>(expected: Choice[], callback: (token: Iterator_Element, abort: () => never) => T) => T;
-    consume: <T>(callback: (token: Iterator_Element) => T) => T;
+export type Raw_Optional_Value<T> = null | [T];
+export type Iterator<Item, End_Info> = {
+    look_raw: () => Raw_Optional_Value<Item>;
+    look_ahead_raw: (offset: number) => Raw_Optional_Value<Item>;
+    look: <T>(item: (token: Item) => T, no_item: (end_info: End_Info) => T) => T;
+    list: <List_Item>($: {
+        has_more_items: ($: Item) => boolean;
+        handle: ($: Item) => List_Item;
+    }) => _pi.List<List_Item>;
+    expect: <T, Error>($: {
+        abort: _pi.Abort<Error>;
+        get_error: ($: _pi.Optional_Value<Item>) => Error;
+        item: (token: Item, abort: () => never) => T;
+    }) => T;
+    optional: <T>($: {
+        item: (token: Item) => _pi.Optional_Value<T>;
+    }) => _pi.Optional_Value<T>;
+    consume: <T>(callback: (token: Item) => T, no_item: () => T) => T;
+    wrap_up: <T>(callback: () => T, post: () => any) => T;
     get_end_info: () => End_Info;
+    discard: <T>(callback: () => T) => void;
 };
-export type Production<Result, Iterator_Element, Choice, End_Info, Parameters> = (iterator: Iterator<Iterator_Element, Choice, End_Info>, parameters: Parameters) => Result;
-export type Production_Without_Parameters<Result, Iterator_Element, Choice, End_Info> = (iterator: Iterator<Iterator_Element, Choice, End_Info>) => Result;
+export type Production<Result, Item, Error, End_Info, Parameters> = (iterator: Iterator<Item, End_Info>, abort: _pi.Abort<Error>, parameters: Parameters) => Result;
+export type Production_Without_Parameters<Result, Item, Error, End_Info> = (iterator: Iterator<Item, End_Info>, abort: _pi.Abort<Error>) => Result;

package/dist/temp_core/temp.d.ts

@@ -1,7 +1,6 @@
 import * as _pi from 'pareto-core/dist/interface';
 import * as new_pi from "./new_interface_signatures";
-export declare const create_iterator: <Iterator_Element, Choice, End_Info>(old: _pi.Iterator<Iterator_Element>, abort: {
-    unexpected_element: (expected: _pi.List<Choice>, element: Iterator_Element, position: number) => never;
-    unexpected_end_with_expected: (expected: _pi.List<Choice>) => never;
-    unguarded_unexpected_end: () => never;
-}, end_info: End_Info) => new_pi.Iterator<Iterator_Element, Choice, End_Info>;
+export declare const create_iterator: <Iterator_Item, End_Info>(iterator_callback: {
+    old: _pi.Iterator<Iterator_Item>;
+    end_info: End_Info;
+}) => new_pi.Iterator<Iterator_Item, End_Info>;

package/dist/temp_core/temp.js

@@ -39,34 +39,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create_iterator = void 0;
 const _p = __importStar(require("pareto-core/dist/assign"));
 const _p_list_build_deprecated_1 = __importDefault(require("pareto-core/dist/_p_list_build_deprecated"));
-const create_iterator = (old, abort, end_info) => ({
-    consume: (callback) => callback(old.consume(($) => $, {
-        no_more_tokens: () => abort.unguarded_unexpected_end()
-    })),
-    expect: (expected, callback) => {
-        const next = old.look();
+const _p_unreachable_code_path_1 = __importDefault(require("pareto-core/dist/_p_unreachable_code_path"));
+const create_iterator = (iterator_callback) => ({
+    look_ahead_raw: (offset) => iterator_callback.old.look_ahead(offset),
+    look_raw: () => iterator_callback.old.look(),
+    look: (item, no_item) => {
+        const next = iterator_callback.old.look();
         if (next === null) {
-            return abort.unexpected_end_with_expected(_p.list.literal(expected));
+            return no_item(iterator_callback.end_info);
         }
-        return callback(next[0], () => abort.unexpected_element(_p.list.literal(expected), next[0], old.get_position()));
+        return item(next[0]);
     },
-    list: (has_more_elements, handle, wrap_up) => {
-        return wrap_up((0, _p_list_build_deprecated_1.default)(($i) => {
+    consume: (callback, no_item) => {
+        const next = iterator_callback.old.look();
+        if (next === null) {
+            return no_item();
+        }
+        return callback(iterator_callback.old.consume(($) => $, {
+            no_more_tokens: () => (0, _p_unreachable_code_path_1.default)("there should not be an unguarded unexpected end"),
+        }));
+    },
+    expect: ($i) => {
+        const next = iterator_callback.old.look();
+        if (next === null) {
+            return $i.abort($i.get_error(_p.optional.literal.not_set()));
+        }
+        return $i.item(next[0], () => $i.abort($i.get_error(_p.optional.literal.set(next[0]))));
+    },
+    optional: ($i) => {
+        const next = iterator_callback.old.look();
+        if (next === null) {
+            return _p.optional.literal.not_set();
+        }
+        return $i.item(next[0]);
+    },
+    list: ($x) => {
+        return (0, _p_list_build_deprecated_1.default)(($i) => {
             while (true) {
-                const next_element = old.look();
+                const next_element = iterator_callback.old.look();
                 if (next_element === null) {
                     return;
                 }
-                else if (!has_more_elements(next_element[0])) {
+                else if (!$x.has_more_items(next_element[0])) {
                     return;
                 }
                 else {
-                    $i['add item'](handle(next_element[0]));
+                    $i['add item']($x.handle(next_element[0]));
                 }
             }
-        }));
+        });
+    },
+    get_end_info: () => iterator_callback.end_info,
+    wrap_up: (callback, post) => {
+        const result = callback();
+        post();
+        return result;
     },
-    get_end_info: () => end_info
+    discard: (callback) => iterator_callback.old.discard(callback)
 });
 exports.create_iterator = create_iterator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZW1wX2NvcmUvdGVtcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBNkM7QUFFN0MseUdBQWdGO0FBSXpFLE1BQU0sZUFBZSxHQUFHLENBQzNCLEdBQW1DLEVBQ25DLEtBSUMsRUFDRCxRQUFrQixFQUNpQyxFQUFFLENBQUMsQ0FBQztJQUN2RCxPQUFPLEVBQUUsQ0FDTCxRQUFRLEVBQ1YsRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUNyQixDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUNSO1FBQ0ksY0FBYyxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsRUFBRTtLQUN6RCxDQUNKLENBQUM7SUFDRixNQUFNLEVBQUUsQ0FDSixRQUFRLEVBQ1IsUUFBUSxFQUNWLEVBQUU7UUFDQSxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDdkIsSUFBSSxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7WUFDaEIsT0FBTyxLQUFLLENBQUMsNEJBQTRCLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtRQUN4RSxDQUFDO1FBQ0QsT0FBTyxRQUFRLENBQ1gsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FDMUIsRUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQ3pCLElBQUksQ0FBQyxDQUFDLENBQUMsRUFDUCxHQUFHLENBQUMsWUFBWSxFQUFFLENBQ3JCLENBQ0osQ0FBQTtJQUVMLENBQUM7SUFDRCxJQUFJLEVBQUUsQ0FDRixpQkFBbUQsRUFDbkQsTUFBNkMsRUFDN0MsT0FBOEMsRUFDM0MsRUFBRTtRQUNMLE9BQU8sT0FBTyxDQUFDLElBQUEsa0NBQXdCLEVBQWUsQ0FBQyxFQUFFLEVBQUUsRUFBRTtZQUN6RCxPQUFPLElBQUksRUFBRSxDQUFDO2dCQUNWLE1BQU0sWUFBWSxHQUFHLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDL0IsSUFBSSxZQUFZLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQ3hCLE9BQU07Z0JBQ1YsQ0FBQztxQkFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztvQkFDN0MsT0FBTTtnQkFDVixDQUFDO3FCQUFNLENBQUM7b0JBQ0osRUFBRSxDQUFDLFVBQVUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO2dCQUMzQyxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDUCxDQUFDO0lBQ0QsWUFBWSxFQUFFLEdBQUcsRUFBRSxDQUFDLFFBQVE7Q0FDL0IsQ0FBQyxDQUFBO0FBdERXLFFBQUEsZUFBZSxtQkFzRDFCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZW1wX2NvcmUvdGVtcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBNkM7QUFFN0MseUdBQWdGO0FBQ2hGLHlHQUFnRjtBQUl6RSxNQUFNLGVBQWUsR0FBRyxDQUEwQixpQkFJeEQsRUFBNEMsRUFBRSxDQUFDLENBQUM7SUFDN0MsY0FBYyxFQUFFLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQztJQUNwRSxRQUFRLEVBQUUsR0FBRyxFQUFFLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRTtJQUM1QyxJQUFJLEVBQUUsQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDcEIsTUFBTSxJQUFJLEdBQUcsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFBO1FBQ3pDLElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU8sT0FBTyxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzlDLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QixDQUFDO0lBQ0QsT0FBTyxFQUFFLENBQ0wsUUFBUSxFQUNSLE9BQU8sRUFDVCxFQUFFO1FBQ0EsTUFBTSxJQUFJLEdBQUcsaUJBQWlCLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFBO1FBQ3pDLElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO1lBQ2hCLE9BQU8sT0FBTyxFQUFFLENBQUE7UUFDcEIsQ0FBQztRQUNELE9BQU8sUUFBUSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQ3pDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astn-core",
-  "version": "0.5.87",
+  "version": "0.5.89",
   "author": "Corno",
   "license": "Apache-2.0",
   "description": "The TypeScript library for parsing and formatting ASTN (Abstract Syntax Tree Notation) - a human-editable data format for structured content",
@@ -33,6 +33,6 @@
     "documentation"
   ],
   "dependencies": {
-    "pareto-fountain-pen": "^0.4.51"
+    "pareto-fountain-pen": "^0.4.52"
   }
 }