@biolibs/bionet 1.8.7 → 1.9.0
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.
- package/README.md +41 -0
- package/dist/log.d.ts +61 -2
- package/dist/log.d.ts.map +1 -1
- package/dist/log.js +17 -0
- package/dist/log.js.map +1 -1
- package/dist/merge.d.ts +41 -0
- package/dist/merge.d.ts.map +1 -1
- package/dist/merge.js +95 -10
- package/dist/merge.js.map +1 -1
- package/dist/method.d.ts.map +1 -1
- package/dist/method.js +9 -3
- package/dist/method.js.map +1 -1
- package/package.json +1 -1
- package/src/log.ts +63 -2
- package/src/merge.ts +115 -9
- package/src/method.ts +7 -1
package/README.md
CHANGED
|
@@ -627,6 +627,47 @@ await write(claude, claudesKey, annotatePart(checksum, [{ type: "CDS", label: "a
|
|
|
627
627
|
(await mergeLog(ada)).parts.find((one) => one.checksum === checksum)?.features[0]?.label; // "as Ada reads it"
|
|
628
628
|
```
|
|
629
629
|
|
|
630
|
+
### A thing the lab has not made
|
|
631
|
+
|
|
632
|
+
A part is known by the checksum of its sequence, so anything with a sequence can be named before it
|
|
633
|
+
exists: a designed plasmid is a part with no tube. What has **no** sequence cannot be named that way —
|
|
634
|
+
the strain a transformation would give, the culture grown from it, a mixture, curd. So the chain of
|
|
635
|
+
work stopped at the first of those, and every step after it had to be proposed afresh once somebody
|
|
636
|
+
was holding something.
|
|
637
|
+
|
|
638
|
+
A **prospect** is how the chain carries on. It is the mirror of a specimen: a specimen is a tube the
|
|
639
|
+
lab holds and cannot name, this is a thing the lab can name and does not hold.
|
|
640
|
+
|
|
641
|
+
```ts
|
|
642
|
+
import { addProspect, newProspectId, planRun, realiseProspect } from "@biolibs/bionet";
|
|
643
|
+
|
|
644
|
+
const strain = newProspectId();
|
|
645
|
+
await write(ada, adasKey, addProspect({
|
|
646
|
+
prospect: strain, name: "GS115 carrying pWren1", kind: "strain",
|
|
647
|
+
madeOf: "GS115, with pWren1 integrated at AOX1", note: null,
|
|
648
|
+
}));
|
|
649
|
+
|
|
650
|
+
// The transformation says what it would bring into existence; the induction after it says it uses it.
|
|
651
|
+
await write(ada, adasKey, planRun({ plan: putting, kind: "transformation", instrument: null,
|
|
652
|
+
inputs: [{ item: tube, amount: 1, role: "construct" }],
|
|
653
|
+
expects: [], makes: [strain], settings: {}, note: null }));
|
|
654
|
+
await write(ada, adasKey, planRun({ plan: growing, kind: "induction", instrument: null,
|
|
655
|
+
inputs: [{ prospect: strain, amount: 0, role: "culture" }],
|
|
656
|
+
expects: [], settings: {}, note: null }));
|
|
657
|
+
|
|
658
|
+
// And once somebody has made it, it says what it turned out to be.
|
|
659
|
+
await write(ada, adasKey, realiseProspect(strain, { strain: made }));
|
|
660
|
+
(await mergeLog(ada)).prospects[0]?.became?.strain; // the strain it became
|
|
661
|
+
```
|
|
662
|
+
|
|
663
|
+
It has **no checksum**, and nothing ever gives it one. Two things follow, and both are the point.
|
|
664
|
+
It cannot satisfy a plan the way a part does — a plan that names one is a plan that cannot be carried
|
|
665
|
+
out yet, and says so. And **it cannot travel in a method**, for the same reason a culture and a
|
|
666
|
+
specimen cannot: telling another lab to use a thing nobody has made is a wish, not a method. A
|
|
667
|
+
published step that rested on one says only *"something the publishing lab had not made: a strain"*.
|
|
668
|
+
The lab's own name for it does not travel either — `GS115 carrying pWren1` is this lab talking to
|
|
669
|
+
itself about something that does not exist.
|
|
670
|
+
|
|
630
671
|
### What it should look like if it worked
|
|
631
672
|
|
|
632
673
|
A plan says what it would **make**. It says nothing about what somebody would **see** — the bands a
|
package/dist/log.d.ts
CHANGED
|
@@ -332,10 +332,16 @@ export declare const recordRun: (run: RunRecord) => Operation;
|
|
|
332
332
|
export declare const newRunId: () => string;
|
|
333
333
|
/** One thing a planned run would use: a tube the lab has, or a part it would first have to get. */
|
|
334
334
|
export interface PlanInput {
|
|
335
|
-
/** The item, if the lab holds a tube of it. Exactly one of `item` and `
|
|
335
|
+
/** The item, if the lab holds a tube of it. Exactly one of `item`, `part` and `prospect` is given. */
|
|
336
336
|
item?: string;
|
|
337
337
|
/** The part's checksum, if there is no tube of it yet: something to be ordered or made first. */
|
|
338
338
|
part?: string;
|
|
339
|
+
/**
|
|
340
|
+
* The prospect, for something nobody has made and nobody can checksum — the strain a transformation
|
|
341
|
+
* would give, the culture grown from it. A plan that names one is a plan that cannot be carried out
|
|
342
|
+
* yet, and says so plainly rather than naming nothing at all.
|
|
343
|
+
*/
|
|
344
|
+
prospect?: string;
|
|
339
345
|
/** How much of it the run would use, in the item's own unit. A whole number, which may be 0. */
|
|
340
346
|
amount: number;
|
|
341
347
|
/** What it would be there as: a template, a forward primer. */
|
|
@@ -368,8 +374,14 @@ export interface PlanRecord {
|
|
|
368
374
|
instrument: string | null;
|
|
369
375
|
/** What it would use. */
|
|
370
376
|
inputs: PlanInput[];
|
|
371
|
-
/** What it is expected to make. */
|
|
377
|
+
/** What it is expected to make, where that is a molecule with a sequence. */
|
|
372
378
|
expects: PlanExpect[];
|
|
379
|
+
/**
|
|
380
|
+
* The prospects it would bring into existence, by ID, where what it makes has no sequence to
|
|
381
|
+
* expect: a strain, a culture, a curd. Without this a transformation makes nothing the record can
|
|
382
|
+
* name, and the chain of work stops at it.
|
|
383
|
+
*/
|
|
384
|
+
makes?: string[];
|
|
373
385
|
/** How to set it up: whole numbers and short text, by name. */
|
|
374
386
|
settings: Record<string, string | number>;
|
|
375
387
|
/** Why, and anything else worth saying. */
|
|
@@ -388,6 +400,53 @@ export declare const planRun: (plan: PlanRecord) => Operation;
|
|
|
388
400
|
export declare const settlePlan: (plan: string, run: string | null) => Operation;
|
|
389
401
|
/** @returns A new ID for a plan, made the way an item's is. */
|
|
390
402
|
export declare const newPlanId: () => string;
|
|
403
|
+
/**
|
|
404
|
+
* Something the lab understands the makeup of and has not made.
|
|
405
|
+
*
|
|
406
|
+
* A part is known by the checksum of its sequence, so everything the lab holds that *has* a sequence
|
|
407
|
+
* can be named before it exists — the nine designed plasmids are parts with no tube. What has no
|
|
408
|
+
* sequence cannot be: a strain that will carry a construct, the culture grown from it, a mixture of
|
|
409
|
+
* four proteins, curd. The chain of work stops at the first of those, and everything after it has to
|
|
410
|
+
* be proposed afresh once somebody is holding something.
|
|
411
|
+
*
|
|
412
|
+
* A prospect is how that chain carries on. It is the mirror of a specimen: a specimen is a tube the
|
|
413
|
+
* lab holds and cannot name, and this is a thing the lab can name and does not hold. It has no
|
|
414
|
+
* checksum — there is no sequence to count one over — so, exactly like a specimen and a culture, it
|
|
415
|
+
* cannot travel in a method. Saying what to do with a thing somebody else does not have is not a
|
|
416
|
+
* method, it is a wish.
|
|
417
|
+
*/
|
|
418
|
+
export interface ProspectRecord {
|
|
419
|
+
/** The prospect's ID. */
|
|
420
|
+
prospect: string;
|
|
421
|
+
/** What it would be called: `GS115 carrying pPIC9K-alphaS1`. */
|
|
422
|
+
name: string;
|
|
423
|
+
/** What kind of thing: `strain`, `culture`, `mixture`, `curd`. Free, like a run's kind. */
|
|
424
|
+
kind: string;
|
|
425
|
+
/** What it would be made of, said for a person. No part of this is machine-readable on purpose. */
|
|
426
|
+
madeOf: string;
|
|
427
|
+
/** Anything else worth saying, or `null`. */
|
|
428
|
+
note: string | null;
|
|
429
|
+
}
|
|
430
|
+
/**
|
|
431
|
+
* @returns The change that names something the lab means to have and has not made.
|
|
432
|
+
*
|
|
433
|
+
* It makes no tube and no part. It exists so that the steps after it can be written down while it is
|
|
434
|
+
* still hypothetical, and so that a reader can tell at a glance which parts of a plan rest on
|
|
435
|
+
* something nobody is holding.
|
|
436
|
+
*/
|
|
437
|
+
export declare const addProspect: (prospect: ProspectRecord) => Operation;
|
|
438
|
+
/**
|
|
439
|
+
* @returns The change that says a prospect has come into existence, and what it turned out to be.
|
|
440
|
+
*
|
|
441
|
+
* Exactly one of `strain` and `item` is given, and it has to be one the lab already has: the thing
|
|
442
|
+
* is added first, the way a specimen's part is, and then this says the prospect was it.
|
|
443
|
+
*/
|
|
444
|
+
export declare const realiseProspect: (prospect: string, became: {
|
|
445
|
+
strain?: string;
|
|
446
|
+
item?: string;
|
|
447
|
+
}) => Operation;
|
|
448
|
+
/** @returns A new ID for a prospect, made the way an item's is. */
|
|
449
|
+
export declare const newProspectId: () => string;
|
|
391
450
|
/**
|
|
392
451
|
* What a lab expects to see if a plan worked, as it would be written before doing it.
|
|
393
452
|
*
|
package/dist/log.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAyC,KAAK,iBAAiB,EAAE,KAAK,cAAc,EAClF,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEzE,oDAAoD;AACpD,eAAO,MAAM,WAAW,IAAI,CAAC;AAE7B,gGAAgG;AAChG,eAAO,MAAM,UAAU,gCAAgC,CAAC;AAExD,wFAAwF;AACxF,eAAO,MAAM,aAAa,SAAU,CAAC;AAErC,yDAAyD;AACzD,eAAO,MAAM,SAAS,OAAQ,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,MAAM,IAAI,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEnD;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,0DAA0D;AAC1D,MAAM,WAAW,QAAQ;IACvB,kBAAkB;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,6FAA6F;IAC7F,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,0FAA0F;IAC1F,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,kBAAkB;IAClB,EAAE,EAAE,SAAS,CAAC;CACf;AAED,uEAAuE;AACvE,MAAM,WAAW,WAAW;IAC1B,2CAA2C;IAC3C,KAAK,EAAE,QAAQ,CAAC;IAChB,sCAAsC;IACtC,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAKD;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAI9D;AAED,iEAAiE;AACjE,MAAM,WAAW,UAAU;IACzB,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,iEAAiE;IACjE,IAAI,EAAE,WAAW,GAAG,IAAI,CAAC;IACzB,kFAAkF;IAClF,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EACjD,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAkBhF;AAYD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EACxD,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAW9E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAKlE;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,CAgDrD;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAM9E;AAED,yDAAyD;AACzD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAM,IAAe,KAAG,SACpC,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,KAAK,MAAM,EAAE,QAAQ,MAAM,KAAG,SACrB,CAAC;AAE3C,kFAAkF;AAClF,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,EAAE,MAAM,IAAI,KAAG,SAAiD,CAAC;AAEpG;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC;AAEzC;;;;;GAKG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,KAAG,SAGgC,CAAC;AAE1J,qGAAqG;AACrG,MAAM,WAAW,WAAW;IAC1B,2FAA2F;IAC3F,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,6FAA6F;IAC7F,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnB,qHAAqH;IACrH,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACzC;AAED,iHAAiH;AACjH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,UAAU,WAAW,EAAE,KAAG,SAAwD,CAAC;AAE9H,8EAA8E;AAC9E,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,WAAW,OAAO,KAAG,SAAsD,CAAC;AAEpH;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,KAAG,SAGjB,CAAC;AAE1H,gHAAgH;AAChH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM,KAAG,SAAgD,CAAC;AAEvG,6EAA6E;AAC7E,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,QAAQ,MAAM,KAAG,SAAqD,CAAC;AAEjH,yEAAyE;AACzE,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,SAA4C,CAAC;AAEvF,yGAAyG;AACzG,MAAM,WAAW,UAAU;IACzB,6HAA6H;IAC7H,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,4CAA4C;IAC5C,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,OAAO;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAA;CAAE,KAAG,SACmD,CAAC;AAE1I,+EAA+E;AAC/E,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,EAAE,QAAQ,MAAM,GAAG,IAAI,KAAG,SAAoD,CAAC;AAEtH,iHAAiH;AACjH,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,EAAE,UAAU,UAAU,GAAG,IAAI,KAAG,SAAuD,CAAC;AAEhI,yEAAyE;AACzE,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,SAA8C,CAAC;AAE3F;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,GAAG,IAAI,EAAE,OAAM;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAW,KAAG,SACvE,CAAC;AAE5C,kEAAkE;AAClE,MAAM,WAAW,QAAQ;IACvB,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;CACd;AAED,uCAAuC;AACvC,MAAM,WAAW,SAAS;IACxB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,gCAAgC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,wDAAwD;IACxD,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,kEAAkE;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,2BAA2B;IAC3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,sDAAsD;AACtD,MAAM,WAAW,SAAS;IACxB,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oBAAoB;IACpB,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,wDAAwD;IACxD,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,yBAAyB;IACzB,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,sCAAsC;IACtC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,KAAK,SAAS,KAAG,SAA6C,CAAC;AAEzF,8DAA8D;AAC9D,eAAO,MAAM,QAAQ,QAAO,MAAqB,CAAC;AAElD,mGAAmG;AACnG,MAAM,WAAW,SAAS;IACxB,
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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"}
|
package/dist/log.js
CHANGED
|
@@ -281,6 +281,23 @@ export const planRun = (plan) => ({ type: "plan.add", ...plan });
|
|
|
281
281
|
export const settlePlan = (plan, run) => ({ type: "plan.settle", plan, run });
|
|
282
282
|
/** @returns A new ID for a plan, made the way an item's is. */
|
|
283
283
|
export const newPlanId = () => newItemId();
|
|
284
|
+
/**
|
|
285
|
+
* @returns The change that names something the lab means to have and has not made.
|
|
286
|
+
*
|
|
287
|
+
* It makes no tube and no part. It exists so that the steps after it can be written down while it is
|
|
288
|
+
* still hypothetical, and so that a reader can tell at a glance which parts of a plan rest on
|
|
289
|
+
* something nobody is holding.
|
|
290
|
+
*/
|
|
291
|
+
export const addProspect = (prospect) => ({ type: "prospect.add", ...prospect });
|
|
292
|
+
/**
|
|
293
|
+
* @returns The change that says a prospect has come into existence, and what it turned out to be.
|
|
294
|
+
*
|
|
295
|
+
* Exactly one of `strain` and `item` is given, and it has to be one the lab already has: the thing
|
|
296
|
+
* is added first, the way a specimen's part is, and then this says the prospect was it.
|
|
297
|
+
*/
|
|
298
|
+
export const realiseProspect = (prospect, became) => ({ type: "prospect.realise", prospect, strain: became.strain ?? null, item: became.item ?? null });
|
|
299
|
+
/** @returns A new ID for a prospect, made the way an item's is. */
|
|
300
|
+
export const newProspectId = () => newItemId();
|
|
284
301
|
/**
|
|
285
302
|
* @returns The change that writes down what a plan's result should look like.
|
|
286
303
|
*
|
package/dist/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EACF,MAAM,sBAAsB,CAAC;AAEzE,oDAAoD;AACpD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC;AAE7B,gGAAgG;AAChG,MAAM,CAAC,MAAM,UAAU,GAAG,6BAA6B,CAAC;AAExD,wFAAwF;AACxF,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC;AAErC,yDAAyD;AACzD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,CAAC;AAsD/B,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAChC,MAAM,GAAG,GAAG,qBAAqB,CAAC;AAElC;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,KAAe;IAC3C,MAAM,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAA+B,CAAC,CAAC;IACjG,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChG,CAAC;AAYD;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAe,EAAE,KAAiB,EAAE,EAAa,EACjD,UAAuB,EAAE;IACxD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC;IACzC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;QAC9F,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,KAAK,GAAa;QACtB,kBAAkB,EAAE,WAAW;QAC/B,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,GAAG,CAAC,SAAS;QACrB,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QACzC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC;QACpD,IAAI,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE;QAC/B,EAAE;KACH,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,+EAA+E;AAC/E,KAAK,UAAU,IAAI,CAAC,KAAe,EAAE,GAAe,EAAE,OAAoB;IACxE,IAAI,CAAC;QACH,aAAa,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;IAC5G,CAAC;IACD,OAAO,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAe,EAAE,KAAuC,EACxD,UAAuB,EAAE;IACtD,MAAM,KAAK,GAAa;QACtB,kBAAkB,EAAE,WAAW;QAC/B,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,GAAG,CAAC,SAAS;QACrB,GAAG,EAAE,CAAC;QACN,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,EAAE;QACR,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;KACrE,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,EAAE,CAAC;AAC5F,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,IAAI,GAAG,KAAiD,CAAC;IAC/D,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;WACrD,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;AACvE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,KAAK,CAAC,KAA0B,CAAC;IAC/C,IAAI,KAAK,CAAC,kBAAkB,KAAK,WAAW,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,yDAAyD,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACjH,CAAC;IACD,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAChI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,GAAI,GAAG,CAAC,IAAI,KAAK,CAAC,GAAI,GAAG,aAAa,EAAE,CAAC;QACjF,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACnF,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACrF,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,EAAE,GAAG,KAAK,CAAC,EAA2C,CAAC;IAC7D,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;WACtF,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,KAAK,cAAc,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,EAAE,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAe,CAAC;IACnC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACnI,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAA+B,CAAC,CAAC;IAC/D,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,cAAc,CAAC,CAAC;IACrG,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;YACzF,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAuC,CAAC;IAChE,IAAI,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ;WAChF,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,SAAS,CAAC,SAAS,KAAK,QAAQ;WAClF,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,EAAE,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG;WACnE,CAAC,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9G,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC5G,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAmB;IACnD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAChF,IAAI,KAAM,CAAC,EAAE,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,KAAK,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACrE,OAAO,EAAE,GAAG,KAAM,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,uEAAuE,EAAE,CAAC;IACpH,CAAC;IACD,OAAO,KAAM,CAAC;AAChB,CAAC;AAED,yDAAyD;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,MAAc,EAAE,OAAa,QAAQ,EAAa,EAAE,CAC3F,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAE9C;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,MAAc,EAAa,EAAE,CACzE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;AAE3C,kFAAkF;AAClF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,IAAU,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AA2BpG;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAA8F,EAAa,EAAE,CACnI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI;IAC5F,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC9E,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;AAc1J,iHAAiH;AACjH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,QAAuB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AAE9H,8EAA8E;AAC9E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,SAAkB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AAEpH;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAA+G,EAAa,EAAE,CACpJ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1F,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7D,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAE1H,gHAAgH;AAChH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAU,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AAEvG,6EAA6E;AAC7E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,MAAc,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAEjH,yEAAyE;AACzE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AAYvF;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAC0D,EAAa,EAAE,CAChG,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAE1I,+EAA+E;AAC/E,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,MAAqB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AAEtH,iHAAiH;AACjH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,QAA2B,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;AAEhI,yEAAyE;AACzE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;AAE3F;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAY,EAAE,KAAoB,EAAE,OAA+C,IAAI,EAAa,EAAE,CAC5H,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAkD5C;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAc,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;AAEzF,8DAA8D;AAC9D,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AA8DlD;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAExF;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,GAAkB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAEhH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,SAAS,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AA8BnD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;AAE5G;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAE,MAA0C,EAAa,EAAE,CACzG,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAErG,mEAAmE;AACnE,MAAM,CAAC,MAAM,aAAa,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AA8BvD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,WAA8B,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;AAEhH;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,GAAY,EAAE,MAAyB,EAAE,EACzD,UAAyD,EAAE,EAAa,EAAE,CACxG,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAE9G;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAc,EAAE,OAAsB,IAAI,EAAa,EAAE,CAC3F,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AAE9C,uEAAuE;AACvE,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AAoC1D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC;AAE5G;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAE,IAAY,EAAa,EAAE,CAC5E,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AAElD,mEAAmE;AACnE,MAAM,CAAC,MAAM,aAAa,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AAEvD;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAoB,EAAa,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;AAElG,iEAAiE;AACjE,MAAM,CAAC,MAAM,WAAW,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AAErD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAiD,EAAE,EAAU,EAAE,KAAa,EAAE,KAA6B,EAAa,EAAE,CACjJ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AAEhD,gEAAgE;AAChE,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC,SAAS,EAAE,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS;IACvB,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC/E,CAAC"}
|
package/dist/merge.d.ts
CHANGED
|
@@ -171,6 +171,43 @@ export interface RunState {
|
|
|
171
171
|
/** The entry that recorded it. */
|
|
172
172
|
added: string;
|
|
173
173
|
}
|
|
174
|
+
/**
|
|
175
|
+
* Something the lab understands the makeup of and has not made.
|
|
176
|
+
*
|
|
177
|
+
* The mirror of a specimen: a specimen is a tube the lab holds and cannot name, this is a thing the
|
|
178
|
+
* lab can name and does not hold. It has no checksum, because there is no sequence to count one
|
|
179
|
+
* over, so like a culture and like a specimen it cannot travel in a method.
|
|
180
|
+
*
|
|
181
|
+
* It exists so that the steps after it can be written down while it is still hypothetical. The chain
|
|
182
|
+
* of work used to stop at a transformation — what that makes is alive and has nothing to point at —
|
|
183
|
+
* and a plan after it could name nothing at all. Now it can name this, and say plainly that it rests
|
|
184
|
+
* on something nobody is holding.
|
|
185
|
+
*/
|
|
186
|
+
export interface ProspectState {
|
|
187
|
+
/** Its ID. */
|
|
188
|
+
prospect: string;
|
|
189
|
+
/** What it would be called. */
|
|
190
|
+
name: string;
|
|
191
|
+
/** What kind of thing: `strain`, `culture`, `mixture`, `curd`. */
|
|
192
|
+
kind: string;
|
|
193
|
+
/** What it would be made of, said for a person. */
|
|
194
|
+
madeOf: string;
|
|
195
|
+
/** Anything else said about it. */
|
|
196
|
+
note: string | null;
|
|
197
|
+
/** What it turned out to be once somebody made it, or `null` while it is still in prospect. */
|
|
198
|
+
became: {
|
|
199
|
+
strain: string | null;
|
|
200
|
+
item: string | null;
|
|
201
|
+
by: string;
|
|
202
|
+
entry: string;
|
|
203
|
+
} | null;
|
|
204
|
+
/** The key that named it. */
|
|
205
|
+
by: string;
|
|
206
|
+
/** Anything else set on it. */
|
|
207
|
+
fields: Record<string, string | number | null>;
|
|
208
|
+
/** The entry that named it. */
|
|
209
|
+
added: string;
|
|
210
|
+
}
|
|
174
211
|
/**
|
|
175
212
|
* What a lab expects to see if a plan worked, and what was seen.
|
|
176
213
|
*
|
|
@@ -237,6 +274,8 @@ export interface PlanState {
|
|
|
237
274
|
length: number;
|
|
238
275
|
checksum: string;
|
|
239
276
|
}[];
|
|
277
|
+
/** The prospects it would bring into existence: what it makes that has no sequence to expect. */
|
|
278
|
+
makes: string[];
|
|
240
279
|
/** How to set it up. */
|
|
241
280
|
settings: Record<string, string | number>;
|
|
242
281
|
/** Why, and anything else said about it. */
|
|
@@ -323,6 +362,8 @@ export interface LabState {
|
|
|
323
362
|
specimens: SpecimenState[];
|
|
324
363
|
/** What the lab expects to see of its plans, and what was seen. */
|
|
325
364
|
expectations: ExpectationState[];
|
|
365
|
+
/** Things the lab means to have and has not made. */
|
|
366
|
+
prospects: ProspectState[];
|
|
326
367
|
/** Every item. */
|
|
327
368
|
items: ItemState[];
|
|
328
369
|
/** Every place. */
|
package/dist/merge.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"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"}
|
package/dist/merge.js
CHANGED
|
@@ -44,6 +44,7 @@ const PLACE_RESERVED = new Set(["place", "kind", "parent", "grid", "standing", "
|
|
|
44
44
|
/** The same, for a strain: what it is and came from is fixed when it is added. */
|
|
45
45
|
const STRAIN_RESERVED = new Set(["strain", "host", "carries", "parent", "from"]);
|
|
46
46
|
const SPECIMEN_RESERVED = new Set(["specimen", "note", "is", "added"]);
|
|
47
|
+
const PROSPECT_RESERVED = new Set(["prospect", "name", "kind", "madeOf", "note", "became", "by", "added"]);
|
|
47
48
|
const EXPECT_RESERVED = new Set(["expect", "plan", "kind", "says", "numbers", "settings", "note", "by", "met", "withdrawn", "added"]);
|
|
48
49
|
/**
|
|
49
50
|
* What a plan's fields may not be called.
|
|
@@ -180,6 +181,8 @@ const KNOWN = {
|
|
|
180
181
|
"expect.add": { expect: true, plan: true, kind: true, says: true, numbers: true, settings: true, note: true },
|
|
181
182
|
"expect.meet": { expect: true, met: true, saw: true, run: true, note: true },
|
|
182
183
|
"expect.withdraw": { expect: true, note: true },
|
|
184
|
+
"prospect.add": { prospect: true, name: true, kind: true, madeOf: true, note: true },
|
|
185
|
+
"prospect.realise": { prospect: true, strain: true, item: true },
|
|
183
186
|
"item.adjust": { item: true, by: true },
|
|
184
187
|
"item.recount": { item: true, amount: true },
|
|
185
188
|
"item.retire": { item: true },
|
|
@@ -194,8 +197,8 @@ const KNOWN = {
|
|
|
194
197
|
outputs: [{ item: true, sequence: true, circular: true, ends: { left: true, right: true }, name: true, amount: true, unit: true }],
|
|
195
198
|
},
|
|
196
199
|
"plan.add": {
|
|
197
|
-
plan: true, kind: true, instrument: true, settings: true, note: true,
|
|
198
|
-
inputs: [{ item: true, part: true, amount: true, role: true }],
|
|
200
|
+
plan: true, kind: true, instrument: true, settings: true, note: true, makes: true,
|
|
201
|
+
inputs: [{ item: true, part: true, prospect: true, amount: true, role: true }],
|
|
199
202
|
expects: [{ sequence: true, circular: true, ends: { left: true, right: true }, name: true }],
|
|
200
203
|
},
|
|
201
204
|
"plan.settle": { plan: true, run: true },
|
|
@@ -273,7 +276,7 @@ const areSettings = (settings) => typeof settings === "object" && settings !== n
|
|
|
273
276
|
* molecule. Whether the run would really make that is not the log's to say. Each reader's own
|
|
274
277
|
* tools work it out again, which is why the plan carries its claim and not its working.
|
|
275
278
|
*/
|
|
276
|
-
function planProblem(op, items, parts, places, plans) {
|
|
279
|
+
function planProblem(op, items, parts, places, plans, prospects) {
|
|
277
280
|
if (!(typeof op["plan"] === "string" && ITEM_ID.test(op["plan"])) || !text(op["kind"], 40))
|
|
278
281
|
return "It does not carry a plan ID and what kind of run it would be.";
|
|
279
282
|
if (plans.has(op["plan"]))
|
|
@@ -290,12 +293,15 @@ function planProblem(op, items, parts, places, plans) {
|
|
|
290
293
|
for (const input of inputs) {
|
|
291
294
|
if (typeof input !== "object" || input === null || !amountOf(input.amount) || input.amount < 0 || !text(input.role, 40))
|
|
292
295
|
return "It does not say how many whole units of each thing it would use, and as what.";
|
|
293
|
-
if (
|
|
294
|
-
return "Each thing it would use has to be a tube or a
|
|
296
|
+
if ([input.item, input.part, input.prospect].filter((one) => one !== undefined).length !== 1) {
|
|
297
|
+
return "Each thing it would use has to be a tube, a part or a prospect, and only one of those.";
|
|
298
|
+
}
|
|
295
299
|
if (input.item !== undefined && !(typeof input.item === "string" && items.has(input.item)))
|
|
296
300
|
return "A tube it would use is not an item the lab has.";
|
|
297
301
|
if (input.part !== undefined && !(typeof input.part === "string" && parts.has(input.part)))
|
|
298
302
|
return "A part it would use is not one the lab has.";
|
|
303
|
+
if (input.prospect !== undefined && !(typeof input.prospect === "string" && prospects.has(input.prospect)))
|
|
304
|
+
return "A prospect it would use is not one the lab has.";
|
|
299
305
|
}
|
|
300
306
|
const expects = op["expects"];
|
|
301
307
|
if (!Array.isArray(expects) || expects.length > MOST_IN_A_RUN)
|
|
@@ -305,6 +311,17 @@ function planProblem(op, items, parts, places, plans) {
|
|
|
305
311
|
return "It does not give each thing it expects a sequence, a name and whether it is a circle.";
|
|
306
312
|
}
|
|
307
313
|
}
|
|
314
|
+
// What a run makes that has no sequence — a strain, a culture, a curd — is named as a prospect
|
|
315
|
+
// instead, so that the step after it has something to point at.
|
|
316
|
+
const makes = op["makes"];
|
|
317
|
+
if (makes !== undefined) {
|
|
318
|
+
if (!Array.isArray(makes) || makes.length > MOST_IN_A_RUN)
|
|
319
|
+
return "It does not list what it would bring into existence.";
|
|
320
|
+
for (const one of makes) {
|
|
321
|
+
if (!(typeof one === "string" && prospects.has(one)))
|
|
322
|
+
return "Something it would bring into existence is not a prospect the lab has.";
|
|
323
|
+
}
|
|
324
|
+
}
|
|
308
325
|
return null;
|
|
309
326
|
}
|
|
310
327
|
/**
|
|
@@ -380,7 +397,7 @@ const hadSeen = (later, earlier) => (later.vc.get(earlier.author) ?? -1) >= earl
|
|
|
380
397
|
* ```
|
|
381
398
|
*/
|
|
382
399
|
export async function mergeLog(entries, options = {}) {
|
|
383
|
-
const state = { lab: options.lab ?? null, name: null, roster: [], parts: [], items: [], places: [], crowded: [], runs: [], plans: [], strains: [], specimens: [], expectations: [], entries: [],
|
|
400
|
+
const state = { lab: options.lab ?? null, name: null, roster: [], parts: [], items: [], places: [], crowded: [], runs: [], plans: [], strains: [], specimens: [], expectations: [], prospects: [], entries: [],
|
|
384
401
|
waiting: [], discarded: [], overlaps: [], heads: {}, knows: {} };
|
|
385
402
|
// Read and check every entry on its own, before any of them is believed about the others.
|
|
386
403
|
const nodes = new Map();
|
|
@@ -659,6 +676,7 @@ function fold(state, placed, chained) {
|
|
|
659
676
|
const strains = new Map();
|
|
660
677
|
const specimens = new Map();
|
|
661
678
|
const expectations = new Map();
|
|
679
|
+
const prospects = new Map();
|
|
662
680
|
/** Each plan, with the entry that settled it, if one has, and anything set on it. */
|
|
663
681
|
const plans = new Map();
|
|
664
682
|
/** Where each item was last put. */
|
|
@@ -970,6 +988,47 @@ function fold(state, placed, chained) {
|
|
|
970
988
|
write(held.set, "is", node, op["part"], `what specimen ${op["specimen"]} is`);
|
|
971
989
|
}
|
|
972
990
|
}
|
|
991
|
+
else if (op.type === "prospect.add") {
|
|
992
|
+
if (!(typeof op["prospect"] === "string" && ITEM_ID.test(op["prospect"])) || !text(op["name"], 200)
|
|
993
|
+
|| !text(op["kind"], 40) || !text(op["madeOf"], 2_000)
|
|
994
|
+
|| !(op["note"] === null || text(op["note"], 2_000))) {
|
|
995
|
+
refuse("It does not carry a prospect ID, what to call it, what kind of thing it is, what it would be made of, and a note or nothing.");
|
|
996
|
+
}
|
|
997
|
+
else if (prospects.has(op["prospect"])) {
|
|
998
|
+
refuse("A prospect with that ID already exists.");
|
|
999
|
+
}
|
|
1000
|
+
else {
|
|
1001
|
+
prospects.set(op["prospect"], {
|
|
1002
|
+
prospect: { prospect: op["prospect"], name: op["name"], kind: op["kind"], madeOf: op["madeOf"],
|
|
1003
|
+
note: op["note"], became: null, by: node.author, fields: {}, added: node.id },
|
|
1004
|
+
set: new Map([["name", { node, value: op["name"] }]]),
|
|
1005
|
+
});
|
|
1006
|
+
}
|
|
1007
|
+
}
|
|
1008
|
+
else if (op.type === "prospect.realise") {
|
|
1009
|
+
const held = typeof op["prospect"] === "string" ? prospects.get(op["prospect"]) : undefined;
|
|
1010
|
+
const strain = op["strain"], item = op["item"];
|
|
1011
|
+
if (held === undefined) {
|
|
1012
|
+
refuse("The prospect it says was made is not one the lab has.");
|
|
1013
|
+
}
|
|
1014
|
+
else if ([strain, item].filter((one) => one !== null && one !== undefined).length !== 1) {
|
|
1015
|
+
refuse("A prospect becomes a strain or an item, and only one of those.");
|
|
1016
|
+
}
|
|
1017
|
+
else if (strain !== null && strain !== undefined && !(typeof strain === "string" && strains.has(strain))) {
|
|
1018
|
+
refuse("The strain it says the prospect became is not one the lab has.");
|
|
1019
|
+
}
|
|
1020
|
+
else if (item !== null && item !== undefined && !(typeof item === "string" && items.has(item))) {
|
|
1021
|
+
refuse("The item it says the prospect became is not one the lab has.");
|
|
1022
|
+
}
|
|
1023
|
+
else {
|
|
1024
|
+
// Two people may make the same thing and say so without knowing of each other. It is a
|
|
1025
|
+
// register like any other, so the same rule settles it and every lab reads the same answer.
|
|
1026
|
+
// What it became and which kind of thing that is are one fact and go in one register: two
|
|
1027
|
+
// registers could be won by different writers, and leave a strain's ID labelled an item.
|
|
1028
|
+
const became = strain !== null && strain !== undefined ? `strain:${strain}` : `item:${item}`;
|
|
1029
|
+
write(held.set, "became", node, became, `what prospect ${op["prospect"]} became`);
|
|
1030
|
+
}
|
|
1031
|
+
}
|
|
973
1032
|
else if (op.type === "expect.add") {
|
|
974
1033
|
const numbers = op["numbers"], settings = op["settings"];
|
|
975
1034
|
if (!(typeof op["expect"] === "string" && ITEM_ID.test(op["expect"])) || !text(op["kind"], 40) || !text(op["says"], 2_000)
|
|
@@ -1063,7 +1122,7 @@ function fold(state, placed, chained) {
|
|
|
1063
1122
|
}
|
|
1064
1123
|
}
|
|
1065
1124
|
else if (op.type === "plan.add") {
|
|
1066
|
-
const problem = planProblem(op, items, parts, places, plans);
|
|
1125
|
+
const problem = planProblem(op, items, parts, places, plans, prospects);
|
|
1067
1126
|
if (problem !== null) {
|
|
1068
1127
|
refuse(problem);
|
|
1069
1128
|
continue;
|
|
@@ -1083,7 +1142,11 @@ function fold(state, placed, chained) {
|
|
|
1083
1142
|
settled: null, set: new Map(),
|
|
1084
1143
|
plan: {
|
|
1085
1144
|
plan: op["plan"], kind: op["kind"], instrument: op["instrument"],
|
|
1086
|
-
inputs: op["inputs"].map((input) => ({
|
|
1145
|
+
inputs: op["inputs"].map((input) => ({
|
|
1146
|
+
...(input.item !== undefined ? { item: input.item } : input.part !== undefined ? { part: input.part } : { prospect: input.prospect }),
|
|
1147
|
+
amount: input.amount, role: input.role
|
|
1148
|
+
})),
|
|
1149
|
+
makes: [...(op["makes"] ?? [])],
|
|
1087
1150
|
expects, settings: { ...op["settings"] }, note: op["note"],
|
|
1088
1151
|
by: node.author, settled: null, wanting: [], orphaned: [], fields: {}, added: node.id,
|
|
1089
1152
|
},
|
|
@@ -1127,9 +1190,10 @@ function fold(state, placed, chained) {
|
|
|
1127
1190
|
: op["on"] === "strain" && typeof op["id"] === "string" ? strains.get(op["id"])
|
|
1128
1191
|
: op["on"] === "specimen" && typeof op["id"] === "string" ? specimens.get(op["id"])
|
|
1129
1192
|
: op["on"] === "plan" && typeof op["id"] === "string" ? plans.get(op["id"])
|
|
1130
|
-
: op["on"] === "expectation" && typeof op["id"] === "string" ? expectations.get(op["id"])
|
|
1193
|
+
: op["on"] === "expectation" && typeof op["id"] === "string" ? expectations.get(op["id"])
|
|
1194
|
+
: op["on"] === "prospect" && typeof op["id"] === "string" ? prospects.get(op["id"]) : undefined;
|
|
1131
1195
|
if (target === undefined) {
|
|
1132
|
-
refuse("It does not name a part, an item, a place, a strain, a specimen, a plan
|
|
1196
|
+
refuse("It does not name a part, an item, a place, a strain, a specimen, a plan, an expectation or a prospect the lab has.");
|
|
1133
1197
|
continue;
|
|
1134
1198
|
}
|
|
1135
1199
|
if (op["on"] === "place" && typeof field === "string" && PLACE_RESERVED.has(field)) {
|
|
@@ -1152,6 +1216,10 @@ function fold(state, placed, chained) {
|
|
|
1152
1216
|
refuse("It does not name a field that can be set.");
|
|
1153
1217
|
continue;
|
|
1154
1218
|
}
|
|
1219
|
+
if (op["on"] === "prospect" && typeof field === "string" && PROSPECT_RESERVED.has(field)) {
|
|
1220
|
+
refuse("It does not name a field that can be set.");
|
|
1221
|
+
continue;
|
|
1222
|
+
}
|
|
1155
1223
|
// An adviser may file its own proposals and nothing else. It proposes the work, so leaving it
|
|
1156
1224
|
// unable to say which project the work is for would have a person filing every step by hand;
|
|
1157
1225
|
// letting it set any field at all would let it rename the lab's parts. This is the same line
|
|
@@ -1216,6 +1284,23 @@ function fold(state, placed, chained) {
|
|
|
1216
1284
|
}
|
|
1217
1285
|
state.specimens.push(specimen);
|
|
1218
1286
|
}
|
|
1287
|
+
for (const { prospect, set } of prospects.values()) {
|
|
1288
|
+
for (const [field, held] of set) {
|
|
1289
|
+
if (field === "name")
|
|
1290
|
+
prospect.name = held.value;
|
|
1291
|
+
else if (field === "became") { /* read below, as one value */ }
|
|
1292
|
+
else
|
|
1293
|
+
prospect.fields[field] = held.value;
|
|
1294
|
+
}
|
|
1295
|
+
const became = set.get("became");
|
|
1296
|
+
if (became !== undefined) {
|
|
1297
|
+
const [kind, ...rest] = String(became.value).split(":");
|
|
1298
|
+
const id = rest.join(":");
|
|
1299
|
+
prospect.became = { strain: kind === "strain" ? id : null, item: kind === "item" ? id : null,
|
|
1300
|
+
by: became.node.author, entry: became.node.id };
|
|
1301
|
+
}
|
|
1302
|
+
state.prospects.push(prospect);
|
|
1303
|
+
}
|
|
1219
1304
|
for (const { expectation, set } of expectations.values()) {
|
|
1220
1305
|
for (const [field, held] of set)
|
|
1221
1306
|
expectation.fields[field] = held.value;
|