pareto-core 0.1.196 → 0.1.198

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,5 @@
1
1
  import * as p_di from "../../../interface/data";
2
2
  import * as p_pi from "../../../interface/production";
3
3
  import { Abort } from "../../../interface/__internal/Abort";
4
- export default function iterate<Item extends p_di.Value, Error extends p_di.Value, End_Info extends p_di.Value, Return_Type extends p_di.Value>(list: p_di.List<Item>, end_info: End_Info, not_finised_error: ($: Item) => p_di.Optional_Value<Error>, abort: Abort<Error>, assign: ($iter: p_pi.Iterator<Item, End_Info, Error>) => Return_Type): Return_Type;
4
+ import { Create_Expect_Error } from "../../../interface/production/__internal/Iterator";
5
+ export default function iterate<Item extends p_di.Value, Error extends p_di.Value, Expected extends p_di.Value, End_Info extends p_di.Value, Return_Type extends p_di.Value>(list: p_di.List<Item>, end_info: End_Info, not_finised_error: ($: Item) => p_di.Optional_Value<Error>, abort: Abort<Error>, create_expect_error: Create_Expect_Error<Item, End_Info, Error, Expected>, assign: ($iter: p_pi.Iterator<Item, End_Info, Error, Expected>) => Return_Type): Return_Type;
@@ -35,7 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.default = iterate;
37
37
  const lit = __importStar(require("../../__internal/sync/literal"));
38
- function iterate(list, end_info, not_finised_error, abort, assign) {
38
+ const from = __importStar(require("../__internal/from"));
39
+ function iterate(list, end_info, not_finised_error, abort, create_expect_error, assign) {
39
40
  const raw = list.__get_raw();
40
41
  const length = raw.length;
41
42
  let position = 0;
@@ -45,18 +46,19 @@ function iterate(list, end_info, not_finised_error, abort, assign) {
45
46
  }
46
47
  return [raw[position]];
47
48
  };
48
- const create_iterator = (transform_the_error) => {
49
+ const create_iterator = (transform_the_error, create_expect_error) => {
49
50
  return {
50
51
  abort: ($) => abort(transform_the_error($)),
51
52
  expect: ($i) => {
52
53
  const next = look_raw();
53
54
  if (next === null) {
54
- return abort(transform_the_error($i.get_error(lit.not_set(), end_info)));
55
+ return abort(transform_the_error(create_expect_error(lit.not_set(), $i.expected, end_info)));
55
56
  }
56
- return $i.item(next[0], () => abort(transform_the_error($i.get_error(lit.set(next[0]), end_info))));
57
+ const result = $i.item(next[0]);
58
+ return from.optional(result).decide(($) => $, () => abort(transform_the_error(create_expect_error(lit.set(next[0]), $i.expected, end_info))));
57
59
  },
58
- to_new_iterator: (transform_error) => {
59
- return create_iterator(($) => transform_the_error(transform_error($)));
60
+ to_new_iterator: (transform_error, cee) => {
61
+ return create_iterator(($) => transform_the_error(transform_error($)), cee);
60
62
  },
61
63
  //methods inherited from Safe_Iterator
62
64
  consume: (assign, no_item) => {
@@ -124,7 +126,7 @@ function iterate(list, end_info, not_finised_error, abort, assign) {
124
126
  },
125
127
  };
126
128
  };
127
- const result = assign(create_iterator(($) => $));
129
+ const result = assign(create_iterator(($) => $, create_expect_error));
128
130
  if (position < length) {
129
131
  not_finised_error(raw[position]).__extract_data(($) => {
130
132
  abort($);
@@ -134,4 +136,4 @@ function iterate(list, end_info, not_finised_error, abort, assign) {
134
136
  }
135
137
  return result;
136
138
  }
137
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXRlcmF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbXBsZW1lbnRhdGlvbi9yZWZpbmVyL3NwZWNpYWxzL2l0ZXJhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFPQSwwQkFzSkM7QUEzSkQsbUVBQW9EO0FBS3BELFNBQXdCLE9BQU8sQ0FNM0IsSUFBcUIsRUFDckIsUUFBa0IsRUFDbEIsaUJBQTBELEVBQzFELEtBQW1CLEVBQ25CLE1BQW9FO0lBR3BFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUU1QixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxDQUFBO0lBRXpCLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQTtJQUVoQixNQUFNLFFBQVEsR0FBRyxHQUE2QixFQUFFO1FBQzVDLElBQUksUUFBUSxHQUFHLENBQUMsSUFBSSxRQUFRLElBQUksR0FBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ3pDLE9BQU8sSUFBSSxDQUFBO1FBQ2YsQ0FBQztRQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtJQUMxQixDQUFDLENBQUE7SUFFRCxNQUFNLGVBQWUsR0FBRyxDQUNwQixtQkFBNEMsRUFDSixFQUFFO1FBQzFDLE9BQU87WUFDSCxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQyxNQUFNLEVBQUUsQ0FDSixFQUFFLEVBQ0osRUFBRTtnQkFDQSxNQUFNLElBQUksR0FBRyxRQUFRLEVBQUUsQ0FBQTtnQkFDdkIsSUFBSSxJQUFJLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQ2hCLE9BQU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQ3pDLEdBQUcsQ0FBQyxPQUFP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
139
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXRlcmF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9pbXBsZW1lbnRhdGlvbi9yZWZpbmVyL3NwZWNpYWxzL2l0ZXJhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFVQSwwQkEyS0M7QUFuTEQsbUVBQW9EO0FBRXBELHlEQUEwQztBQU0xQyxTQUF3QixPQUFPLENBTzNCLElBQXFCLEVBQ3JCLFFBQWtCLEVBQ2xCLGlCQUEwRCxFQUMxRCxLQUFtQixFQUNuQixtQkFBeUUsRUFDekUsTUFBOEU7SUFHOUUsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBRTVCLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUE7SUFFekIsSUFBSSxRQUFRLEdBQUcsQ0FBQyxDQUFBO0lBRWhCLE1BQU0sUUFBUSxHQUFHLEdBQTZCLEVBQUU7UUFDNUMsSUFBSSxRQUFRLEdBQUcsQ0FBQyxJQUFJLFFBQVEsSUFBSSxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDekMsT0FBTyxJQUFJLENBQUE7UUFDZixDQUFDO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFBO0lBQzFCLENBQUMsQ0FBQTtJQUVELE1BQU0sZUFBZSxHQUFHLENBSXBCLG1CQUE0QyxFQUM1QyxtQkFBaUYsRUFDM0IsRUFBRTtRQUN4RCxPQUFPO1lBQ0gsS0FBSyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0MsTUFBTSxFQUFFLENBQ0osRUFBRSxFQUNKLEVBQUU7Z0JBQ0EsTUFBTSxJQUFJLEdBQUcsUUFBUSxFQUFFLENBQUE7Z0JBQ3ZCLElBQUksSUFBSSxLQUFLLElBQUksRUFBRSxDQUFDO29CQUNoQixPQUFPLEtBQUssQ0FBQyxtQkFBbUIs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
@@ -1,11 +1,12 @@
1
1
  import * as p_di from "../../data";
2
2
  import { Abort } from "../../__internal/Abort";
3
3
  import { Safe_Iterator } from "./Safe_Iterator";
4
- export interface Iterator<Item extends p_di.Value, End_Info extends p_di.Value, Error extends p_di.Value> extends Safe_Iterator<Item, End_Info> {
4
+ export type Create_Expect_Error<Item extends p_di.Value, End_Info extends p_di.Value, Error extends p_di.Value, Expected extends p_di.Value> = ($: p_di.Optional_Value<Item>, expected: Expected, end_info: End_Info) => Error;
5
+ export interface Iterator<Item extends p_di.Value, End_Info extends p_di.Value, Error extends p_di.Value, Expected extends p_di.Value> extends Safe_Iterator<Item, End_Info> {
5
6
  abort: Abort<Error>;
6
7
  expect: <T extends p_di.Value>($: {
7
- get_error: ($: p_di.Optional_Value<Item>, end_info: End_Info) => Error;
8
- item: (token: Item, abort: Abort<null>) => T;
8
+ expected: Expected;
9
+ item: (token: Item) => p_di.Optional_Value<T>;
9
10
  }) => T;
10
- to_new_iterator: <New_Error extends p_di.Value>(transform_error: ($: New_Error) => Error) => Iterator<Item, End_Info, New_Error>;
11
+ to_new_iterator: <New_Error extends p_di.Value, New_Expected extends p_di.Value>(transform_error: ($: New_Error) => Error, create_expect_error: Create_Expect_Error<Item, End_Info, New_Error, New_Expected>) => Iterator<Item, End_Info, New_Error, New_Expected>;
11
12
  }
@@ -3,7 +3,7 @@ import { Safe_Iterator } from "./__internal/Safe_Iterator";
3
3
  import * as p_di from "../data";
4
4
  export { Iterator } from "./__internal/Iterator";
5
5
  export { Safe_Iterator } from "./__internal/Safe_Iterator";
6
- export type Production<Result extends p_di.Value, Error extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value> = (iterator: Iterator<Iterator_Item, End_Info, Error>) => Result;
7
- export type Production_With_Parameter<Result extends p_di.Value, Error extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value, Parameter extends p_di.Value> = (iterator: Iterator<Iterator_Item, End_Info, Error>, $p: Parameter) => Result;
6
+ export type Production<Result extends p_di.Value, Error extends p_di.Value, Expected extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value> = (iterator: Iterator<Iterator_Item, End_Info, Error, Expected>) => Result;
7
+ export type Production_With_Parameter<Result extends p_di.Value, Error extends p_di.Value, Expected extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value, Parameter extends p_di.Value> = (iterator: Iterator<Iterator_Item, End_Info, Error, Expected>, $p: Parameter) => Result;
8
8
  export type Production_Without_Error<Result extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value> = (iterator: Safe_Iterator<Iterator_Item, End_Info>) => Result;
9
9
  export type Production_Without_Error_With_Parameter<Result extends p_di.Value, Iterator_Item extends p_di.Value, End_Info extends p_di.Value, Parameter extends p_di.Value> = (iterator: Safe_Iterator<Iterator_Item, End_Info>, $p: Parameter) => Result;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pareto-core",
3
- "version": "0.1.196",
3
+ "version": "0.1.198",
4
4
  "license": "Apache-2.0",
5
5
  "author": "Corno",
6
6
  "description": "the core language constructs for the Pareto programming language (in TypeScript)",