@biolibs/bionet 1.8.3 → 1.8.5
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 +81 -3
- package/dist/log.d.ts +32 -2
- package/dist/log.d.ts.map +1 -1
- package/dist/log.js +24 -3
- package/dist/log.js.map +1 -1
- package/dist/merge.d.ts +31 -4
- package/dist/merge.d.ts.map +1 -1
- package/dist/merge.js +82 -10
- package/dist/merge.js.map +1 -1
- package/dist/method.d.ts.map +1 -1
- package/dist/method.js +8 -0
- package/dist/method.js.map +1 -1
- package/package.json +1 -1
- package/src/log.ts +39 -4
- package/src/merge.ts +100 -13
- package/src/method.ts +7 -0
package/README.md
CHANGED
|
@@ -236,7 +236,9 @@ const everything = [...new Set([...ada, ...bob])];
|
|
|
236
236
|
```
|
|
237
237
|
|
|
238
238
|
`mergeLog` takes every entry held, in any order, and returns the lab: its roster, its parts, its
|
|
239
|
-
items and how much of each,
|
|
239
|
+
items and how much of each, the places they are kept in, the strains it grows and the specimens it
|
|
240
|
+
has not read yet, what was done at the bench and what is proposed — and for every entry whether it
|
|
241
|
+
counted and why not if not.
|
|
240
242
|
|
|
241
243
|
| Rule | Why |
|
|
242
244
|
|---|---|
|
|
@@ -502,6 +504,45 @@ what it used; only the strain and the culture are turned away, as changes it doe
|
|
|
502
504
|
Whether a transformation worked is whether anything grew. Nothing in the log can work that out from
|
|
503
505
|
what came out, because nothing came out, so a person says it.
|
|
504
506
|
|
|
507
|
+
### A tube nobody has sequenced
|
|
508
|
+
|
|
509
|
+
Every freezer has them: something handed over at a meeting, something from the back of the −80 with a
|
|
510
|
+
name on the lid and nothing behind it. A part is known by its sequence, so a tube whose sequence
|
|
511
|
+
nobody has read cannot be a tube of a part — and writing down a guess would make the lab's own record
|
|
512
|
+
the place the guess became a fact. So it is a specimen: a tube that is held, counted and moved like
|
|
513
|
+
any other, and says only what is written on the lid.
|
|
514
|
+
|
|
515
|
+
```ts
|
|
516
|
+
import { addSpecimen, identifySpecimen, newSpecimenId } from "@biolibs/bionet";
|
|
517
|
+
|
|
518
|
+
const unknown = newSpecimenId();
|
|
519
|
+
await write(ada, adasKey, addSpecimen({ specimen: unknown, name: "pET from the back of the -80",
|
|
520
|
+
note: "handed over at a meetup, no map" }));
|
|
521
|
+
await write(ada, adasKey, addItem({ item: newItemId(), specimen: unknown, amount: 15, unit: "µL" }));
|
|
522
|
+
(await mergeLog(ada)).items.at(-1)?.part; // null: nobody knows what is in it
|
|
523
|
+
(await mergeLog(ada)).specimens[0]?.is; // null: and the lab does not pretend to
|
|
524
|
+
|
|
525
|
+
// Sequencing it says what it is. The sequence is added as a part, and the specimen points at it.
|
|
526
|
+
await write(ada, adasKey, addPart({ sequence: F2, name: "pET-wrenA" }));
|
|
527
|
+
const read = (await mergeLog(ada)).parts.find((one) => one.name === "pET-wrenA")!.checksum;
|
|
528
|
+
await write(ada, adasKey, identifySpecimen(unknown, read));
|
|
529
|
+
(await mergeLog(ada)).items.at(-1)?.part; // the checksum: the tube now reads as a tube of it
|
|
530
|
+
```
|
|
531
|
+
|
|
532
|
+
The tube does not move and does not change. It keeps its place, its amount and its history, because
|
|
533
|
+
the tube never changed — only what is known about it did. An item is of a part, a strain **or** a
|
|
534
|
+
specimen, never more than one.
|
|
535
|
+
|
|
536
|
+
A specimen has no checksum, because a checksum is of a sequence and there is no sequence yet. Two
|
|
537
|
+
things follow, and both are the point rather than a limitation. It cannot satisfy a plan: a plan
|
|
538
|
+
names what it needs by checksum, and an unread tube matches nothing. And it cannot travel in a
|
|
539
|
+
method, for the same reason a culture cannot — a step that used one says there was something
|
|
540
|
+
unidentified there, and not what the lid said, because what a lab writes on a tube it cannot name is
|
|
541
|
+
a private note to itself and says nothing another lab could use.
|
|
542
|
+
|
|
543
|
+
Two people may sequence the same tube at once and get the same answer, which is the ordinary case and
|
|
544
|
+
settles itself. Where they disagree, the lower entry ID stands, as everywhere else.
|
|
545
|
+
|
|
505
546
|
### What somebody proposes doing
|
|
506
547
|
|
|
507
548
|
A plan is a run nobody has done. It has a run's shape with everything that says something happened
|
|
@@ -530,8 +571,39 @@ await write(ada, adasKey, settlePlan(proposed, done)); // or settlePlan(prop
|
|
|
530
571
|
|
|
531
572
|
An input may name a `part` in place of an `item`, for something there is no tube of yet. A plan
|
|
532
573
|
carries what it expects and not how that was worked out: each reader's own tools work it out again
|
|
533
|
-
and can say whether they agree.
|
|
534
|
-
|
|
574
|
+
and can say whether they agree.
|
|
575
|
+
|
|
576
|
+
A plan is kept whatever happens around it, and says what has gone wrong rather than being refused for
|
|
577
|
+
it. Two of those are worked out from the lab as a whole, which is the only place either is visible:
|
|
578
|
+
|
|
579
|
+
- **`wanting`** — the tubes it counts on that have since been retired or run short.
|
|
580
|
+
- **`orphaned`** — the molecules it would use that only a plan the lab has **set aside** would have
|
|
581
|
+
made. Refiling a plan leaves the ones downstream of it naming what the old plan would have made;
|
|
582
|
+
no entry is wrong for saying so, and no reader of one entry can see it. Something still to be
|
|
583
|
+
ordered is not listed: nothing here was ever going to make it.
|
|
584
|
+
|
|
585
|
+
```ts
|
|
586
|
+
// The molecule is designed, so the lab can name it; whether anything is going to make it is a
|
|
587
|
+
// separate question, and the answer is whichever plans are open.
|
|
588
|
+
await write(ada, adasKey, addPart({ sequence: F3, name: "ligated" }));
|
|
589
|
+
const built = (await mergeLog(ada)).parts.find((one) => one.name === "ligated")!.checksum;
|
|
590
|
+
|
|
591
|
+
const makes = newPlanId();
|
|
592
|
+
await write(ada, adasKey, planRun({ plan: makes, kind: "ligation", instrument: null,
|
|
593
|
+
inputs: [{ item: tube, amount: 1, role: "backbone" }],
|
|
594
|
+
expects: [{ sequence: F3, circular: false, name: "ligated" }],
|
|
595
|
+
settings: {}, note: "join the pieces" }));
|
|
596
|
+
const next = newPlanId();
|
|
597
|
+
await write(ada, adasKey, planRun({ plan: next, kind: "transformation", instrument: null,
|
|
598
|
+
inputs: [{ part: built, amount: 0, role: "plasmid" }],
|
|
599
|
+
expects: [], settings: {}, note: "into BL21" }));
|
|
600
|
+
(await mergeLog(ada)).plans.find((one) => one.plan === next)?.orphaned; // []: the ligation makes it
|
|
601
|
+
|
|
602
|
+
// She thinks better of the ligation and sets it aside. The transformation is still asking for what
|
|
603
|
+
// it would have made, and now says so.
|
|
604
|
+
await write(ada, adasKey, settlePlan(makes, null));
|
|
605
|
+
(await mergeLog(ada)).plans.find((one) => one.plan === next)?.orphaned; // [built]
|
|
606
|
+
```
|
|
535
607
|
|
|
536
608
|
The link from a run to its plan is the settling entry's alone. A recorded run is, field for field,
|
|
537
609
|
what it always was, so a device too old to know of plans still reads the run and holds the same
|
|
@@ -601,6 +673,12 @@ npx vitest run packages/bionet/test
|
|
|
601
673
|
the messages is for whatever uses this.
|
|
602
674
|
- **Nothing here fetches a part.** Finding out who has a plasmid is as far as software goes; the rest
|
|
603
675
|
is an email and a padded envelope.
|
|
676
|
+
- **Two things a lab holds cannot leave it in a method**: a culture, because it is alive, and a
|
|
677
|
+
specimen, because nobody has read it. A step that used a specimen says there was something
|
|
678
|
+
unidentified there — not what the lid said, which is a private note and no use to anybody else.
|
|
679
|
+
- **A plan is never refused for what happened around it.** It is kept, and says what is wrong:
|
|
680
|
+
`wanting` for tubes retired or run short, `orphaned` for a molecule only a plan now set aside would
|
|
681
|
+
have made. Both are worked out from the whole lab, because neither is visible in any one entry.
|
|
604
682
|
|
|
605
683
|
## License
|
|
606
684
|
|
package/dist/log.d.ts
CHANGED
|
@@ -222,13 +222,15 @@ export declare const annotatePart: (part: string, features: PartFeature[]) => Op
|
|
|
222
222
|
/** @returns The change that says whether a part is on offer to other labs. */
|
|
223
223
|
export declare const offerPart: (part: string, available: boolean) => Operation;
|
|
224
224
|
/**
|
|
225
|
-
* @returns The change that adds one physical lot: a tube of a part,
|
|
226
|
-
* Exactly one of `part
|
|
225
|
+
* @returns The change that adds one physical lot: a tube of a part, a culture of a strain, or a
|
|
226
|
+
* tube of a specimen nobody has identified. Exactly one of `part`, `strain` and `specimen` is
|
|
227
|
+
* given, and `amount` is a whole number of `unit`.
|
|
227
228
|
*/
|
|
228
229
|
export declare const addItem: (item: {
|
|
229
230
|
item: string;
|
|
230
231
|
part?: string;
|
|
231
232
|
strain?: string;
|
|
233
|
+
specimen?: string;
|
|
232
234
|
amount: number;
|
|
233
235
|
unit?: string | null;
|
|
234
236
|
}) => Operation;
|
|
@@ -408,6 +410,34 @@ export interface StrainRecord {
|
|
|
408
410
|
/** The run that made it, if one did. */
|
|
409
411
|
from: string | null;
|
|
410
412
|
}
|
|
413
|
+
/** A thing the lab physically has and cannot yet name. */
|
|
414
|
+
export interface SpecimenRecord {
|
|
415
|
+
/** The specimen's ID. */
|
|
416
|
+
specimen: string;
|
|
417
|
+
/** What the lab would write on the tube: `pET from the back of the -80`. Not a claim of identity. */
|
|
418
|
+
name: string;
|
|
419
|
+
/** Anything worth saying about where it came from, or `null`. */
|
|
420
|
+
note: string | null;
|
|
421
|
+
}
|
|
422
|
+
/**
|
|
423
|
+
* @returns The change that says the lab has something it has not identified. It makes no tube of
|
|
424
|
+
* it: `addItem` with the specimen does that, the way a tube of a part is added after the part.
|
|
425
|
+
*
|
|
426
|
+
* A specimen is the freezer's honest answer to a tube nobody has sequenced. It has no checksum,
|
|
427
|
+
* because a checksum is of a sequence and there is no sequence yet, so it cannot satisfy a plan and
|
|
428
|
+
* cannot travel in a method — the same way a culture cannot, and for the same reason.
|
|
429
|
+
*/
|
|
430
|
+
export declare const addSpecimen: (specimen: SpecimenRecord) => Operation;
|
|
431
|
+
/**
|
|
432
|
+
* @returns The change that says what a specimen turned out to be.
|
|
433
|
+
*
|
|
434
|
+
* The part has to be one the lab already has, so the sequence that came back is added first. The
|
|
435
|
+
* tube does not move and does not change: it keeps its place, its amount and its history, because
|
|
436
|
+
* the tube never changed — only what is known about it did.
|
|
437
|
+
*/
|
|
438
|
+
export declare const identifySpecimen: (specimen: string, part: string) => Operation;
|
|
439
|
+
/** @returns A new ID for a specimen, made the way an item's is. */
|
|
440
|
+
export declare const newSpecimenId: () => string;
|
|
411
441
|
/**
|
|
412
442
|
* @returns The change that says the lab has a strain. It makes no culture of it: `addItem` with the
|
|
413
443
|
* strain does that, the way a tube of a part is added after the part.
|
package/dist/log.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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
|
|
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,0FAA0F;IAC1F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iGAAiG;IACjG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gGAAgG;IAChG,MAAM,EAAE,MAAM,CAAC;IACf,+DAA+D;IAC/D,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wGAAwG;AACxG,MAAM,WAAW,UAAU;IACzB,qCAAqC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,gCAAgC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,wDAAwD;IACxD,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,gEAAgE;IAChE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,yBAAyB;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,mCAAmC;IACnC,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,2CAA2C;IAC3C,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,UAAU,KAAG,SAA4C,CAAC;AAExF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,KAAK,MAAM,GAAG,IAAI,KAAG,SAAiD,CAAC;AAEhH,+DAA+D;AAC/D,eAAO,MAAM,SAAS,QAAO,MAAqB,CAAC;AAEnD;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qFAAqF;IACrF,IAAI,EAAE,MAAM,CAAC;IACb,yFAAyF;IACzF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,qGAAqG;IACrG,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,GAAI,UAAU,cAAc,KAAG,SAAoD,CAAC;AAE5G;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,KAAG,SACjB,CAAC;AAElD,mEAAmE;AACnE,eAAO,MAAM,aAAa,QAAO,MAAqB,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,YAAY,KAAG,SAAgD,CAAC;AAElG,iEAAiE;AACjE,eAAO,MAAM,WAAW,QAAO,MAAqB,CAAC;AAErD;;;;;;;;GAQG;AACH,eAAO,MAAM,QAAQ,GAAI,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,EAAE,IAAI,MAAM,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,GAAG,MAAM,GAAG,IAAI,KAAG,SACxF,CAAC;AAEhD,gEAAgE;AAChE,eAAO,MAAM,UAAU,QAAO,MAAqB,CAAC;AAEpD;;;;;;;GAOG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAGlC"}
|
package/dist/log.js
CHANGED
|
@@ -231,11 +231,13 @@ export const annotatePart = (part, features) => ({ type: "part.annotate", part,
|
|
|
231
231
|
/** @returns The change that says whether a part is on offer to other labs. */
|
|
232
232
|
export const offerPart = (part, available) => ({ type: "part.offer", part, available });
|
|
233
233
|
/**
|
|
234
|
-
* @returns The change that adds one physical lot: a tube of a part,
|
|
235
|
-
* Exactly one of `part
|
|
234
|
+
* @returns The change that adds one physical lot: a tube of a part, a culture of a strain, or a
|
|
235
|
+
* tube of a specimen nobody has identified. Exactly one of `part`, `strain` and `specimen` is
|
|
236
|
+
* given, and `amount` is a whole number of `unit`.
|
|
236
237
|
*/
|
|
237
238
|
export const addItem = (item) => ({ type: "item.add", item: item.item, ...(item.part === undefined ? {} : { part: item.part }),
|
|
238
|
-
...(item.strain === undefined ? {} : { strain: item.strain }),
|
|
239
|
+
...(item.strain === undefined ? {} : { strain: item.strain }),
|
|
240
|
+
...(item.specimen === undefined ? {} : { specimen: item.specimen }), amount: item.amount, unit: item.unit ?? null });
|
|
239
241
|
/** @returns The change that adds to or takes from an item. `by` is a whole-number difference, never a total. */
|
|
240
242
|
export const adjustItem = (item, by) => ({ type: "item.adjust", item, by });
|
|
241
243
|
/** @returns The change that says how much of an item is physically there. */
|
|
@@ -279,6 +281,25 @@ export const planRun = (plan) => ({ type: "plan.add", ...plan });
|
|
|
279
281
|
export const settlePlan = (plan, run) => ({ type: "plan.settle", plan, run });
|
|
280
282
|
/** @returns A new ID for a plan, made the way an item's is. */
|
|
281
283
|
export const newPlanId = () => newItemId();
|
|
284
|
+
/**
|
|
285
|
+
* @returns The change that says the lab has something it has not identified. It makes no tube of
|
|
286
|
+
* it: `addItem` with the specimen does that, the way a tube of a part is added after the part.
|
|
287
|
+
*
|
|
288
|
+
* A specimen is the freezer's honest answer to a tube nobody has sequenced. It has no checksum,
|
|
289
|
+
* because a checksum is of a sequence and there is no sequence yet, so it cannot satisfy a plan and
|
|
290
|
+
* cannot travel in a method — the same way a culture cannot, and for the same reason.
|
|
291
|
+
*/
|
|
292
|
+
export const addSpecimen = (specimen) => ({ type: "specimen.add", ...specimen });
|
|
293
|
+
/**
|
|
294
|
+
* @returns The change that says what a specimen turned out to be.
|
|
295
|
+
*
|
|
296
|
+
* The part has to be one the lab already has, so the sequence that came back is added first. The
|
|
297
|
+
* tube does not move and does not change: it keeps its place, its amount and its history, because
|
|
298
|
+
* the tube never changed — only what is known about it did.
|
|
299
|
+
*/
|
|
300
|
+
export const identifySpecimen = (specimen, part) => ({ type: "specimen.identify", specimen, part });
|
|
301
|
+
/** @returns A new ID for a specimen, made the way an item's is. */
|
|
302
|
+
export const newSpecimenId = () => newItemId();
|
|
282
303
|
/**
|
|
283
304
|
* @returns The change that says the lab has a strain. It makes no culture of it: `addItem` with the
|
|
284
305
|
* strain does that, the way a tube of a part is added after the part.
|
package/dist/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;;;GAGG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAA4F,EAAa,EAAE,CACjI,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,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;AAEpH,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;AAkDlD;;;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;AAyBnD;;;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"}
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"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"}
|
package/dist/merge.d.ts
CHANGED
|
@@ -66,17 +66,35 @@ export interface StrainState {
|
|
|
66
66
|
/** The entry that added it. */
|
|
67
67
|
added: string;
|
|
68
68
|
}
|
|
69
|
-
/**
|
|
69
|
+
/** Something the lab physically has and cannot yet name. */
|
|
70
|
+
export interface SpecimenState {
|
|
71
|
+
/** Its ID. */
|
|
72
|
+
specimen: string;
|
|
73
|
+
/** What the lab would write on the tube. Never a claim about what is in it. */
|
|
74
|
+
name: string;
|
|
75
|
+
/** Anything said about where it came from. */
|
|
76
|
+
note: string | null;
|
|
77
|
+
/** The checksum it turned out to be, once an identification said so, or `null` while unknown. */
|
|
78
|
+
is: string | null;
|
|
79
|
+
/** Anything else set on it. */
|
|
80
|
+
fields: Record<string, string | number | null>;
|
|
81
|
+
/** The entry that added it. */
|
|
82
|
+
added: string;
|
|
83
|
+
}
|
|
84
|
+
/** One physical item: a tube of a molecule, a culture of a strain, or a tube of a specimen. */
|
|
70
85
|
export interface ItemState {
|
|
71
86
|
/** Its ID. */
|
|
72
87
|
item: string;
|
|
73
88
|
/**
|
|
74
|
-
* The checksum of the part it is an item of, or `null
|
|
75
|
-
*
|
|
89
|
+
* The checksum of the part it is an item of, or `null`. Exactly one of this, `strain` and
|
|
90
|
+
* `specimen` is set when it is added; a specimen that has since been identified reads with both
|
|
91
|
+
* `specimen` and `part`, because the tube is the same tube and is now known.
|
|
76
92
|
*/
|
|
77
93
|
part: string | null;
|
|
78
|
-
/** The strain it is a culture of, or `null` if it is
|
|
94
|
+
/** The strain it is a culture of, or `null` if it is not a culture. */
|
|
79
95
|
strain: string | null;
|
|
96
|
+
/** The specimen it is a tube of, or `null`. Set whether or not it has been identified. */
|
|
97
|
+
specimen: string | null;
|
|
80
98
|
/** What one of its amount is, if anybody said: a tube, a microlitre. */
|
|
81
99
|
unit: string | null;
|
|
82
100
|
/** How much there is, by the log. Always a whole number of the unit. */
|
|
@@ -189,6 +207,13 @@ export interface PlanState {
|
|
|
189
207
|
* would use. The plan is kept and shown; somebody has to look before carrying it out.
|
|
190
208
|
*/
|
|
191
209
|
wanting: string[];
|
|
210
|
+
/**
|
|
211
|
+
* For a plan still open: the molecules it would use that only a plan the lab has set aside would
|
|
212
|
+
* have made. Refiling a plan leaves the ones downstream of it naming what the old plan would have
|
|
213
|
+
* made, which no entry is wrong for saying and no reader of one entry can see. A molecule still to
|
|
214
|
+
* be ordered is not listed: nothing was ever going to make it here.
|
|
215
|
+
*/
|
|
216
|
+
orphaned: string[];
|
|
192
217
|
/** Anything else set on it, such as which project it is part of. */
|
|
193
218
|
fields: Record<string, string | number | null>;
|
|
194
219
|
/** The entry that proposed it. */
|
|
@@ -247,6 +272,8 @@ export interface LabState {
|
|
|
247
272
|
parts: PartState[];
|
|
248
273
|
/** Every strain. */
|
|
249
274
|
strains: StrainState[];
|
|
275
|
+
/** Everything the lab has and cannot yet name. */
|
|
276
|
+
specimens: SpecimenState[];
|
|
250
277
|
/** Every item. */
|
|
251
278
|
items: ItemState[];
|
|
252
279
|
/** 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":"AA+BA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAA+C,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,IAAI,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EACvJ,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAC3D,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAqB,KAAK,iBAAiB,EAAsB,KAAK,QAAQ,EAC5E,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,8CAA8C;AAC9C,eAAO,MAAM,gBAAgB,SAAU,CAAC;AAExC,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACxB,sCAAsC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,wFAAwF;IACxF,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAChD;AAED,+DAA+D;AAC/D,MAAM,WAAW,SAAS;IACxB,0FAA0F;IAC1F,QAAQ,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,iBAAiB;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,8BAA8B;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,OAAO,EAAE,OAAO,CAAC;IACjB,2FAA2F;IAC3F,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,yHAAyH;IACzH,IAAI,EAAE,QAAQ,CAAC;IACf,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,gCAAgC;AAChC,MAAM,WAAW,WAAW;IAC1B,cAAc;IACd,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAA+C,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,IAAI,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EACvJ,KAAK,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAC3D,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAqB,KAAK,iBAAiB,EAAsB,KAAK,QAAQ,EAC5E,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,8CAA8C;AAC9C,eAAO,MAAM,gBAAgB,SAAU,CAAC;AAExC,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACxB,sCAAsC;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,wFAAwF;IACxF,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAChD;AAED,+DAA+D;AAC/D,MAAM,WAAW,SAAS;IACxB,0FAA0F;IAC1F,QAAQ,EAAE,MAAM,CAAC;IACjB,0BAA0B;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,iBAAiB;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,8BAA8B;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,OAAO,EAAE,OAAO,CAAC;IACjB,2FAA2F;IAC3F,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,yHAAyH;IACzH,IAAI,EAAE,QAAQ,CAAC;IACf,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,gCAAgC;AAChC,MAAM,WAAW,WAAW;IAC1B,cAAc;IACd,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,4DAA4D;AAC5D,MAAM,WAAW,aAAa;IAC5B,cAAc;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,iGAAiG;IACjG,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,+FAA+F;AAC/F,MAAM,WAAW,SAAS;IACxB,cAAc;IACd,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,uEAAuE;IACvE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,0FAA0F;IAC1F,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,wEAAwE;IACxE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,8FAA8F;IAC9F,YAAY,EAAE,OAAO,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,2FAA2F;IAC3F,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC9E,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oDAAoD;AACpD,MAAM,WAAW,UAAU;IACzB,cAAc;IACd,KAAK,EAAE,MAAM,CAAC;IACd,8FAA8F;IAC9F,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,6DAA6D;IAC7D,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,8DAA8D;IAC9D,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC;IAC5B,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,0DAA0D;AAC1D,MAAM,WAAW,QAAQ;IACvB,cAAc;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,mDAAmD;IACnD,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,0DAA0D;IAC1D,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,yBAAyB;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,yBAAyB;IACzB,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kCAAkC;IAClC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wDAAwD;AACxD,MAAM,WAAW,SAAS;IACxB,cAAc;IACd,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,oEAAoE;IACpE,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,sFAAsF;IACtF,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACnH,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAC1C,4CAA4C;IAC5C,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,gCAAgC;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,uHAAuH;IACvH,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAClE;;;OAGG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,oEAAoE;IACpE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,kCAAkC;IAClC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,0EAA0E;AAC1E,MAAM,WAAW,OAAO;IACtB,eAAe;IACf,KAAK,EAAE,MAAM,CAAC;IACd,oBAAoB;IACpB,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,mCAAmC;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,gCAAgC;AAChC,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,gBAAgB,CAAC;AAEjF,4EAA4E;AAC5E,MAAM,WAAW,MAAM;IACrB,cAAc;IACd,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,0BAA0B;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,uEAAuE;AACvE,MAAM,WAAW,QAAQ;IACvB,oBAAoB;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,gCAAgC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,oFAAoF;AACpF,MAAM,WAAW,OAAO;IACtB,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,sCAAsC;AACtC,MAAM,WAAW,QAAQ;IACvB,0EAA0E;IAC1E,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,kCAAkC;IAClC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,8CAA8C;IAC9C,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,kBAAkB;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,oBAAoB;IACpB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,kDAAkD;IAClD,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,kBAAkB;IAClB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,mBAAmB;IACnB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,mFAAmF;IACnF,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,yFAAyF;IACzF,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,4FAA4F;IAC5F,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,0EAA0E;IAC1E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gEAAgE;IAChE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,qGAAqG;IACrG,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,+BAA+B;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,sEAAsE;IACtE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC/C;AAoGD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAA;CAAE,GAAG,MAAM,CAErH;AAyGD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAMvD;AAuFD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,EAAE,OAAO,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CA0G7G;AAwiBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAC/C,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAU/E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAC9B,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,SAAS,SAAS,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,iBAAiB,CAkBvH"}
|
package/dist/merge.js
CHANGED
|
@@ -43,6 +43,7 @@ const text = (value, most) => typeof value === "string" && value.length > 0 && v
|
|
|
43
43
|
const PLACE_RESERVED = new Set(["place", "kind", "parent", "grid", "standing", "retired", "adrift"]);
|
|
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
|
+
const SPECIMEN_RESERVED = new Set(["specimen", "note", "is", "added"]);
|
|
46
47
|
/**
|
|
47
48
|
* What a plan's fields may not be called.
|
|
48
49
|
*
|
|
@@ -51,7 +52,7 @@ const STRAIN_RESERVED = new Set(["strain", "host", "carries", "parent", "from"])
|
|
|
51
52
|
* something nobody proposed. A field says what a plan is *about* — which project it is part of,
|
|
52
53
|
* say — and nothing about what carrying it out would do.
|
|
53
54
|
*/
|
|
54
|
-
const PLAN_RESERVED = new Set(["plan", "kind", "instrument", "inputs", "expects", "settings", "note", "by", "settled", "wanting", "added"]);
|
|
55
|
+
const PLAN_RESERVED = new Set(["plan", "kind", "instrument", "inputs", "expects", "settings", "note", "by", "settled", "wanting", "orphaned", "added"]);
|
|
55
56
|
/** The most positions a box may have along one side, and the farthest a place may stand or reach, in millimetres. */
|
|
56
57
|
const MOST_SIDE = 100;
|
|
57
58
|
const FARTHEST = 1_000_000;
|
|
@@ -171,8 +172,10 @@ const KNOWN = {
|
|
|
171
172
|
"part.add": { sequence: true, circular: true, name: true, kind: true, ends: { left: true, right: true } },
|
|
172
173
|
"part.annotate": { part: true, features: [{ type: true, label: true, strand: true, parts: [{ start: true, end: true }] }] },
|
|
173
174
|
"part.offer": { part: true, available: true },
|
|
174
|
-
"item.add": { item: true, part: true, strain: true, amount: true, unit: true },
|
|
175
|
+
"item.add": { item: true, part: true, strain: true, specimen: true, amount: true, unit: true },
|
|
175
176
|
"strain.add": { strain: true, name: true, host: true, carries: true, parent: true, from: true },
|
|
177
|
+
"specimen.add": { specimen: true, name: true, note: true },
|
|
178
|
+
"specimen.identify": { specimen: true, part: true },
|
|
176
179
|
"item.adjust": { item: true, by: true },
|
|
177
180
|
"item.recount": { item: true, amount: true },
|
|
178
181
|
"item.retire": { item: true },
|
|
@@ -371,7 +374,7 @@ const hadSeen = (later, earlier) => (later.vc.get(earlier.author) ?? -1) >= earl
|
|
|
371
374
|
* ```
|
|
372
375
|
*/
|
|
373
376
|
export async function mergeLog(entries, options = {}) {
|
|
374
|
-
const state = { lab: options.lab ?? null, name: null, roster: [], parts: [], items: [], places: [], crowded: [], runs: [], plans: [], strains: [], entries: [],
|
|
377
|
+
const state = { lab: options.lab ?? null, name: null, roster: [], parts: [], items: [], places: [], crowded: [], runs: [], plans: [], strains: [], specimens: [], entries: [],
|
|
375
378
|
waiting: [], discarded: [], overlaps: [], heads: {}, knows: {} };
|
|
376
379
|
// Read and check every entry on its own, before any of them is believed about the others.
|
|
377
380
|
const nodes = new Map();
|
|
@@ -648,6 +651,7 @@ function fold(state, placed, chained) {
|
|
|
648
651
|
};
|
|
649
652
|
const places = new Map();
|
|
650
653
|
const strains = new Map();
|
|
654
|
+
const specimens = new Map();
|
|
651
655
|
/** Each plan, with the entry that settled it, if one has, and anything set on it. */
|
|
652
656
|
const plans = new Map();
|
|
653
657
|
/** Where each item was last put. */
|
|
@@ -725,8 +729,8 @@ function fold(state, placed, chained) {
|
|
|
725
729
|
else if (items.has(op["item"])) {
|
|
726
730
|
refuse("An item with that ID already exists.");
|
|
727
731
|
}
|
|
728
|
-
else if (
|
|
729
|
-
refuse("An item is of a part
|
|
732
|
+
else if ([op["part"], op["strain"], op["specimen"]].filter((one) => one !== undefined).length !== 1) {
|
|
733
|
+
refuse("An item is of a part, a culture of a strain, or a tube of a specimen, and only one of those.");
|
|
730
734
|
}
|
|
731
735
|
else if (op["part"] !== undefined && (typeof op["part"] !== "string" || !parts.has(op["part"]))) {
|
|
732
736
|
refuse("The part it is an item of is not one the lab has.");
|
|
@@ -734,9 +738,13 @@ function fold(state, placed, chained) {
|
|
|
734
738
|
else if (op["strain"] !== undefined && (typeof op["strain"] !== "string" || !strains.has(op["strain"]))) {
|
|
735
739
|
refuse("The strain it is a culture of is not one the lab has.");
|
|
736
740
|
}
|
|
741
|
+
else if (op["specimen"] !== undefined && (typeof op["specimen"] !== "string" || !specimens.has(op["specimen"]))) {
|
|
742
|
+
refuse("The specimen it is a tube of is not one the lab has.");
|
|
743
|
+
}
|
|
737
744
|
else {
|
|
738
745
|
items.set(op["item"], {
|
|
739
746
|
item: { item: op["item"], part: op["part"] ?? null, strain: op["strain"] ?? null,
|
|
747
|
+
specimen: op["specimen"] ?? null,
|
|
740
748
|
unit: op["unit"], amount: 0, retired: false, needsRecount: false, from: null, where: null, fields: {}, added: node.id },
|
|
741
749
|
set: new Map(), base: { node, amount: op["amount"], recount: false }, adjusted: [], overlapped: false,
|
|
742
750
|
});
|
|
@@ -888,7 +896,7 @@ function fold(state, placed, chained) {
|
|
|
888
896
|
});
|
|
889
897
|
}
|
|
890
898
|
items.set(output.item, {
|
|
891
|
-
item: { item: output.item, part: checksum, strain: null, unit: output.unit, amount: 0, retired: false, needsRecount: false, from: op["run"],
|
|
899
|
+
item: { item: output.item, part: checksum, strain: null, specimen: null, unit: output.unit, amount: 0, retired: false, needsRecount: false, from: op["run"],
|
|
892
900
|
where: null, fields: {}, added: node.id },
|
|
893
901
|
set: new Map(), base: { node, amount: output.amount, recount: false }, adjusted: [], overlapped: false,
|
|
894
902
|
});
|
|
@@ -926,6 +934,35 @@ function fold(state, placed, chained) {
|
|
|
926
934
|
});
|
|
927
935
|
}
|
|
928
936
|
}
|
|
937
|
+
else if (op.type === "specimen.add") {
|
|
938
|
+
if (!(typeof op["specimen"] === "string" && ITEM_ID.test(op["specimen"])) || !text(op["name"], 200)
|
|
939
|
+
|| !(op["note"] === null || text(op["note"], 2_000))) {
|
|
940
|
+
refuse("It does not carry a specimen ID, what to call it and a note or nothing.");
|
|
941
|
+
}
|
|
942
|
+
else if (specimens.has(op["specimen"])) {
|
|
943
|
+
refuse("A specimen with that ID already exists.");
|
|
944
|
+
}
|
|
945
|
+
else {
|
|
946
|
+
specimens.set(op["specimen"], {
|
|
947
|
+
specimen: { specimen: op["specimen"], name: op["name"], note: op["note"], is: null, fields: {}, added: node.id },
|
|
948
|
+
set: new Map([["name", { node, value: op["name"] }]]),
|
|
949
|
+
});
|
|
950
|
+
}
|
|
951
|
+
}
|
|
952
|
+
else if (op.type === "specimen.identify") {
|
|
953
|
+
const held = typeof op["specimen"] === "string" ? specimens.get(op["specimen"]) : undefined;
|
|
954
|
+
if (held === undefined) {
|
|
955
|
+
refuse("The specimen it identifies is not one the lab has.");
|
|
956
|
+
}
|
|
957
|
+
else if (!(typeof op["part"] === "string" && parts.has(op["part"]))) {
|
|
958
|
+
refuse("What it says the specimen is is not a part the lab has.");
|
|
959
|
+
}
|
|
960
|
+
else {
|
|
961
|
+
// Two people may identify the same tube without knowing of each other. This is a register
|
|
962
|
+
// like any other, so the same rule settles it and every lab reads the same answer.
|
|
963
|
+
write(held.set, "is", node, op["part"], `what specimen ${op["specimen"]} is`);
|
|
964
|
+
}
|
|
965
|
+
}
|
|
929
966
|
else if (op.type === "plan.add") {
|
|
930
967
|
const problem = planProblem(op, items, parts, places, plans);
|
|
931
968
|
if (problem !== null) {
|
|
@@ -949,7 +986,7 @@ function fold(state, placed, chained) {
|
|
|
949
986
|
plan: op["plan"], kind: op["kind"], instrument: op["instrument"],
|
|
950
987
|
inputs: op["inputs"].map((input) => ({ ...(input.item === undefined ? { part: input.part } : { item: input.item }), amount: input.amount, role: input.role })),
|
|
951
988
|
expects, settings: { ...op["settings"] }, note: op["note"],
|
|
952
|
-
by: node.author, settled: null, wanting: [], fields: {}, added: node.id,
|
|
989
|
+
by: node.author, settled: null, wanting: [], orphaned: [], fields: {}, added: node.id,
|
|
953
990
|
},
|
|
954
991
|
});
|
|
955
992
|
}
|
|
@@ -989,9 +1026,10 @@ function fold(state, placed, chained) {
|
|
|
989
1026
|
: op["on"] === "item" && typeof op["id"] === "string" ? items.get(op["id"])
|
|
990
1027
|
: op["on"] === "place" && typeof op["id"] === "string" ? places.get(op["id"])
|
|
991
1028
|
: op["on"] === "strain" && typeof op["id"] === "string" ? strains.get(op["id"])
|
|
992
|
-
: op["on"] === "
|
|
1029
|
+
: op["on"] === "specimen" && typeof op["id"] === "string" ? specimens.get(op["id"])
|
|
1030
|
+
: op["on"] === "plan" && typeof op["id"] === "string" ? plans.get(op["id"]) : undefined;
|
|
993
1031
|
if (target === undefined) {
|
|
994
|
-
refuse("It does not name a part, an item, a place, a strain or a plan the lab has.");
|
|
1032
|
+
refuse("It does not name a part, an item, a place, a strain, a specimen or a plan the lab has.");
|
|
995
1033
|
continue;
|
|
996
1034
|
}
|
|
997
1035
|
if (op["on"] === "place" && typeof field === "string" && PLACE_RESERVED.has(field)) {
|
|
@@ -1002,6 +1040,10 @@ function fold(state, placed, chained) {
|
|
|
1002
1040
|
refuse("It does not name a field that can be set.");
|
|
1003
1041
|
continue;
|
|
1004
1042
|
}
|
|
1043
|
+
if (op["on"] === "specimen" && typeof field === "string" && SPECIMEN_RESERVED.has(field)) {
|
|
1044
|
+
refuse("It does not name a field that can be set.");
|
|
1045
|
+
continue;
|
|
1046
|
+
}
|
|
1005
1047
|
if (op["on"] === "plan" && typeof field === "string" && PLAN_RESERVED.has(field)) {
|
|
1006
1048
|
refuse("It does not name a field that can be set.");
|
|
1007
1049
|
continue;
|
|
@@ -1014,7 +1056,7 @@ function fold(state, placed, chained) {
|
|
|
1014
1056
|
refuse("An adviser may only set a field on a plan of its own.");
|
|
1015
1057
|
continue;
|
|
1016
1058
|
}
|
|
1017
|
-
if (field === "name" && (op["on"] === "place" || op["on"] === "strain") && !text(value, 200)) {
|
|
1059
|
+
if (field === "name" && (op["on"] === "place" || op["on"] === "strain" || op["on"] === "specimen") && !text(value, 200)) {
|
|
1018
1060
|
refuse("A name has to be some text.");
|
|
1019
1061
|
continue;
|
|
1020
1062
|
}
|
|
@@ -1059,16 +1101,39 @@ function fold(state, placed, chained) {
|
|
|
1059
1101
|
}
|
|
1060
1102
|
state.strains.push(strain);
|
|
1061
1103
|
}
|
|
1104
|
+
for (const { specimen, set } of specimens.values()) {
|
|
1105
|
+
for (const [field, held] of set) {
|
|
1106
|
+
if (field === "name")
|
|
1107
|
+
specimen.name = held.value;
|
|
1108
|
+
else if (field === "is")
|
|
1109
|
+
specimen.is = held.value;
|
|
1110
|
+
else
|
|
1111
|
+
specimen.fields[field] = held.value;
|
|
1112
|
+
}
|
|
1113
|
+
state.specimens.push(specimen);
|
|
1114
|
+
}
|
|
1062
1115
|
for (const { item, set, base, adjusted, overlapped } of items.values()) {
|
|
1063
1116
|
// A recount replaces the adjustments its author had seen. Everything else still counts.
|
|
1064
1117
|
const since = adjusted.filter((one) => !hadSeen(base.node, one.node)).reduce((sum, one) => sum + one.by, 0);
|
|
1065
1118
|
item.amount = base.amount + since;
|
|
1066
1119
|
item.needsRecount = item.amount < 0 || overlapped;
|
|
1120
|
+
// Once a specimen has been identified, its tubes read as tubes of that molecule. The tube is
|
|
1121
|
+
// the same tube: it keeps its place, its amount and its history, and says where it came from.
|
|
1122
|
+
if (item.specimen !== null && item.part === null) {
|
|
1123
|
+
item.part = specimens.get(item.specimen)?.set.get("is")?.value ?? null;
|
|
1124
|
+
}
|
|
1067
1125
|
for (const [field, held] of set)
|
|
1068
1126
|
item.fields[field] = held.value;
|
|
1069
1127
|
item.where = (put.get(item.item)?.get("where")?.value ?? null);
|
|
1070
1128
|
state.items.push(item);
|
|
1071
1129
|
}
|
|
1130
|
+
// Which molecules the lab could actually put into a plan: one a live tube holds, or one a plan
|
|
1131
|
+
// still open is expected to make. And, separately, the ones whose only maker has been set aside.
|
|
1132
|
+
const heldNow = new Set(state.items.filter((one) => !one.retired && one.amount > 0 && one.part !== null).map((one) => one.part));
|
|
1133
|
+
const willBeMade = new Set(), wasToBeMade = new Set();
|
|
1134
|
+
for (const { plan } of plans.values())
|
|
1135
|
+
for (const expect of plan.expects)
|
|
1136
|
+
(plan.settled === null ? willBeMade : wasToBeMade).add(expect.checksum);
|
|
1072
1137
|
// A plan counts on tubes that go on being used after it is written. It is not refused for that:
|
|
1073
1138
|
// it is kept, and says which of them are no longer what it needs.
|
|
1074
1139
|
for (const { plan, set } of plans.values()) {
|
|
@@ -1079,6 +1144,13 @@ function fold(state, placed, chained) {
|
|
|
1079
1144
|
const held = input.item === undefined ? undefined : items.get(input.item)?.item;
|
|
1080
1145
|
return held !== undefined && (held.retired || held.amount < input.amount) ? [held.item] : [];
|
|
1081
1146
|
});
|
|
1147
|
+
// Refiling a plan leaves the plans downstream of it pointing at what the old one would have
|
|
1148
|
+
// made. Nothing about either plan is wrong on its own, so neither is refused; what is wrong is
|
|
1149
|
+
// the pair, and only the lab as a whole can see it. A molecule still to be ordered is not this:
|
|
1150
|
+
// it was never any plan's output, so it is left alone. This is the molecule a plan the lab has
|
|
1151
|
+
// set aside would have made, and that nothing open makes now.
|
|
1152
|
+
plan.orphaned = plan.inputs.flatMap((input) => input.part !== undefined && !heldNow.has(input.part) && !willBeMade.has(input.part) && wasToBeMade.has(input.part)
|
|
1153
|
+
? [input.part] : []);
|
|
1082
1154
|
}
|
|
1083
1155
|
state.plans.push(plan);
|
|
1084
1156
|
}
|