linked-rolls 0.59.0 → 0.61.0

package/lib/collation/Collation.d.ts

@@ -108,19 +108,23 @@ export declare const uncheckedMotivation: {
 };
 /**
  * Whether the edit is one a collation writes by itself: a bare
- * insertion or a bare deletion saying nothing further, or an
- * equivalence between two systems' spellings for one command.
+ * insertion or a bare deletion saying nothing further, or a recoding
+ * that exchanges two systems' spellings for one command.
  *
  * Collating again rewrites these and keeps the rest. An edit that says
  * what the change is, or why it was made, or what it rests on, is an
  * editor's reading of the difference between two texts, and collating
  * the two again is no reason to discard it.
  *
- * An equivalence counts as the collation's own even where an editor
+ * Such an exchange counts as the collation's own even where an editor
  * added a motivation to it, because it is derived rather than read:
  * freezing it would leave the transfers, where nearly every edit is
  * one, unable to be collated again at all. What an editor wrote on it
- * is not lost by that, since `connectVersions` keeps an equivalence it
+ * is not lost by that, since `connectVersions` keeps an exchange it
  * draws a second time over the very same symbols.
+ *
+ * A recoding that only inserts or only deletes is the editor's: a
+ * collation types no one-sided edit, so one typed so is a reading of
+ * the transfer that collating again must not undo.
  */
 export declare const isCollationsOwn: (edit: Readonly<Edit>) => boolean;

package/lib/collation/Collation.js

@@ -88,7 +88,7 @@ export const collationsOf = (own, inherited, locate, tolerance = defaultCollatio
         .map(({ symbol: counterpart }) => ({ symbol, counterpart })));
 };
 /** The edit type a collation draws by itself, from the two systems' vocabularies rather than off the paper. */
-const drawnByCollation = 'replace-with-equivalent';
+const drawnByCollation = 'recoding';
 /**
  * The motivation a collation writes on what it makes, saying that
  * nobody has read it yet.
@@ -112,22 +112,26 @@ export const uncheckedMotivation = {
 };
 /**
  * Whether the edit is one a collation writes by itself: a bare
- * insertion or a bare deletion saying nothing further, or an
- * equivalence between two systems' spellings for one command.
+ * insertion or a bare deletion saying nothing further, or a recoding
+ * that exchanges two systems' spellings for one command.
  *
  * Collating again rewrites these and keeps the rest. An edit that says
  * what the change is, or why it was made, or what it rests on, is an
  * editor's reading of the difference between two texts, and collating
  * the two again is no reason to discard it.
  *
- * An equivalence counts as the collation's own even where an editor
+ * Such an exchange counts as the collation's own even where an editor
  * added a motivation to it, because it is derived rather than read:
  * freezing it would leave the transfers, where nearly every edit is
  * one, unable to be collated again at all. What an editor wrote on it
- * is not lost by that, since `connectVersions` keeps an equivalence it
+ * is not lost by that, since `connectVersions` keeps an exchange it
  * draws a second time over the very same symbols.
+ *
+ * A recoding that only inserts or only deletes is the editor's: a
+ * collation types no one-sided edit, so one typed so is a reading of
+ * the transfer that collating again must not undo.
  */
-export const isCollationsOwn = (edit) => edit.editType === drawnByCollation
+export const isCollationsOwn = (edit) => (edit.editType === drawnByCollation && !!edit.insert?.length && !!edit.delete?.length)
     || (edit.editType === undefined
         && (edit.motivation === undefined || edit.motivation === unchecked)
         && edit['@annotation'] === undefined);

package/lib/io/migrate.js

@@ -54,6 +54,13 @@ const withTypology = (node) => {
     }
     return node;
 };
+/** Edit types renamed since: an exchange of two systems' spellings is one kind of recoding. */
+const renamedEditTypes = {
+    'replace-with-equivalent': 'recoding'
+};
+const withRenamedEditType = (node) => typeof node.editType === 'string' && Object.hasOwn(renamedEditTypes, node.editType)
+    ? { ...node, editType: renamedEditTypes[node.editType] }
+    : node;
 const withRenamedType = (node) => Object.hasOwn(renamedTypes, node['@type']) ? { ...node, '@type': renamedTypes[node['@type']] } : node;
 /** Whether the feature is of the class under either name, since a node is migrated before its children are. */
 const isOfType = (type) => (feature) => feature?.['@type'] === type || renamedTypes[feature?.['@type']] === type;
@@ -371,7 +378,7 @@ const withTimeSpanDates = (node) => {
     const { '@value': within, '@type': _typed, ...rest } = node;
     return { ...rest, within };
 };
-const migrateNode = (node) => [withRenamedKeys, withTypology, withRenamedType, withoutVersionType, withoutVersionSiglum, withLowerCaseTerms, withSplitMethod, withReferences, withKeeper, withoutEmptyKeeper,
+const migrateNode = (node) => [withRenamedKeys, withRenamedEditType, withTypology, withRenamedType, withoutVersionType, withoutVersionSiglum, withLowerCaseTerms, withSplitMethod, withReferences, withKeeper, withoutEmptyKeeper,
     withPerforator, withProductionNodes, withTypedPerforator, withScale, withoutOps, withDerivationList, withReadingKind, withTimeSpanDates,
     withoutFeatureKind, withBorneFeaturesNamed, withFeaturesInActs, withDriveOfStaggering, withoutPattern, withoutBearings, withoutEntailedType]
     .reduce((result, step) => step(result), node);

package/lib/model/Assumption.d.ts

@@ -71,11 +71,29 @@ export interface BeliefAdoption extends Argumentation<'beliefAdoption'> {
      */
     note: string;
 }
+/**
+ * A measurement takes a value off an object by a stated procedure: the
+ * period the slot lengths of a copy keep, the median pitch of its held
+ * notes. It concludes the belief in that value by itself, with no
+ * premises. CRMinf counts observations, and a measurement is one, among
+ * the ways a belief comes about, so the value does not have to be
+ * passed off as an inference.
+ * @see crmsci:S21 Measurement
+ */
+export interface Measurement extends Argumentation<'measurement'> {
+    /**
+     * References (by `@id` or URL) to what the measurement was taken on
+     * or with, such as the scan, the analysis output or the script.
+     * @see crm:P16 used specific object
+     */
+    used?: string[];
+}
 /**
  * An argumentation can be either a plain argumentation, a
- * meaning comprehension, an inference, or a belief adoption.
+ * meaning comprehension, an inference, a belief adoption or a
+ * measurement.
  */
-export type AnyArgumentation = MeaningComprehension | Inference | BeliefAdoption | Argumentation;
+export type AnyArgumentation = MeaningComprehension | Inference | BeliefAdoption | Measurement | Argumentation;
 /**
  * A belief is a temporal object and associates a proposition (i.e.
  * a statement) with a certainty. It comes into existence through
@@ -143,21 +161,39 @@ export type ObjectAssumption<O extends object> = Assumption & O;
  * annotated with a belief about its certainty.
  */
 export type ActorAssignment = ObjectAssumption<Person>;
+/** The day an event falls within. */
+interface DateWithin {
+    /**
+     * The day the event falls within.
+     * @format date
+     * @see crm:P82 at some time within
+     */
+    within: Date;
+}
+/** The bounds an event lies between. */
+interface DateBounds {
+    /**
+     * The earliest day the event can have happened on: it did not
+     * happen before it.
+     * @format date
+     * @see crm:P82a begin of the begin
+     */
+    after: Date;
+    /**
+     * The latest day the event can have happened on: it did not
+     * happen after it.
+     * @format date
+     * @see crm:P82b end of the end
+     */
+    before: Date;
+}
 /**
  * When something happened, as far as the edition can state it: the day
  * it falls `within`, or the bounds it lies between. A bound nobody can
  * give is left out, so `after` alone says "not before".
  * @see crm:E52 Time-Span
  */
-export type DateAssignment = Assumption & ({
-    within: Date;
-} | {
-    after: Date;
-    before?: Date;
-} | {
-    before: Date;
-    after?: Date;
-});
+export type DateAssignment = Assumption & (DateWithin | (Pick<DateBounds, 'after'> & Partial<Pick<DateBounds, 'before'>>) | (Pick<DateBounds, 'before'> & Partial<Pick<DateBounds, 'after'>>));
 export declare function valueOf<ValueT>(assumption: ValueAssumption<ValueT>): ValueT;
 export declare function valuesOf<ValueT>(assumptions: ValueAssumption<ValueT>[]): ValueT[];
 export declare function idOf(assumption: ReferenceAssumption): string;
@@ -177,3 +213,4 @@ export declare const dateOf: (assignment: DateAssignment) => Date | undefined;
 export declare const earliestOf: (assignment: DateAssignment) => Date | undefined;
 /** The latest the event can have happened, as far as the edition states it. */
 export declare const latestOf: (assignment: DateAssignment) => Date | undefined;
+export {};

package/lib/model/Edit.d.ts

@@ -1,13 +1,14 @@
 import { Assumption } from "./Assumption.js";
 import { AnySymbol } from "./Symbol.js";
 import { WithId } from "../shared/utils.js";
-export declare const editTypes: readonly [
+export declare const editTypes: readonly ['additional-accent', 'add-redundancy', 'remove-redundancy', 
 /**
- * An additional accent that can only be encoded with
- * sforzando on/off due to the short space left between
- * the notes to be differentiated.
+ * Carries the text into another reproducing system's coding: a
+ * latched pair of one system giving way to the other's held command,
+ * a command the other system cannot read struck, or one of its own
+ * put in where the first had no word for it.
  */
-'short-dynamic-differentation', 'additional-accent', 'add-redundancy', 'remove-redundancy', 'replace-with-equivalent', 'shift', 'correct-error', 'shorten', 'prolong'];
+'recoding', 'shift', 'correct-error', 'shorten', 'prolong'];
 /**
  * The type of editorial change applied to a symbol or set of symbols.
  * Classifies the nature of the edit, e.g. whether it corrects an error,

package/lib/model/Edit.js

@@ -1,14 +1,14 @@
 export const editTypes = [
-    /**
-     * An additional accent that can only be encoded with
-     * sforzando on/off due to the short space left between
-     * the notes to be differentiated.
-     */
-    'short-dynamic-differentation',
     'additional-accent',
     'add-redundancy',
     'remove-redundancy',
-    'replace-with-equivalent',
+    /**
+     * Carries the text into another reproducing system's coding: a
+     * latched pair of one system giving way to the other's held command,
+     * a command the other system cannot read struck, or one of its own
+     * put in where the first had no word for it.
+     */
+    'recoding',
     'shift',
     'correct-error',
     'shorten',

package/lib/model/RollCopy.d.ts

@@ -85,15 +85,19 @@ export type ScaleReading = {
 export interface ProductionEvent {
     /**
      * The company that produced the roll copy
-     * (e.g. "M. Welte & Söhne").
+     * (e.g. "M. Welte & Söhne"). An object assumption, so that a
+     * company read off a box label or adopted from a letter can say
+     * where it comes from.
      * @see crm:P14 carried out by
      */
-    company?: Agent;
+    company?: ObjectAssumption<Agent>;
     /**
-     * The paper the roll copy was cut on.
+     * The paper the roll copy was cut on. An object assumption, so that
+     * what the paper is taken to be can say how that was found and serve
+     * as a premise, e.g. of a dating.
      * @see crm:P126 employed
      */
-    paper?: Concept;
+    paper?: ObjectAssumption<Concept>;
     /**
      * The date of production, if known.
      * @see crm:P4 has time-span

package/lib/ops/collation.js

@@ -98,7 +98,7 @@ export const connectVersions = (given, childId, parentId, tolerance = defaultCol
         return alreadyStated.get(exchangeKey(inserted, deleted)) ?? {
             type: 'edit',
             id: v4(),
-            editType: 'replace-with-equivalent',
+            editType: 'recoding',
             motivation: unchecked,
             insert: [...by],
             delete: deleted

package/lib/ops/edits.js

@@ -31,18 +31,24 @@ const guessEditType = (view, versionId, edit) => {
     const bar = trackerBarOf(view.version(versionId)?.system);
     const parentBar = trackerBarOf(view.predecessorOf(versionId)?.system);
     /**
-     * Where the version is coded for another system than its parent, an
-     * exchange of expression matter is the transfer being carried out:
-     * a red ForzandoOn and ForzandoOff pair giving way to one held green
-     * SforzandoForte says the same thing in the other system's words,
-     * which is what 'replace-with-equivalent' is for. Calling it a
-     * corrected error would say the editor made a mistake.
+     * Where the version is coded for another system than its parent,
+     * expression matter changed is the transfer being carried out: a red
+     * ForzandoOn and ForzandoOff pair giving way to one held green
+     * SforzandoForte says the same thing in the other system's words, and
+     * a red command the green bar cannot read struck, or a green hold put
+     * in where the red had no word for it, belongs to the same act. That
+     * is a recoding. Calling it a corrected error would say the editor
+     * made a mistake. Only an insertion spelling the bar's own accent
+     * reads more narrowly, as the accent it spells.
      */
-    if (bar && parentBar && bar.id !== parentBar.id && inserted.length > 0 && deleted.length > 0) {
-        return 'replace-with-equivalent';
-    }
+    const transferred = bar && parentBar && bar.id !== parentBar.id;
+    if (transferred && inserted.length > 0 && deleted.length > 0)
+        return 'recoding';
     if (deleted.length === 0 && accentsOn(bar).some(accent => sameSequence(inserted, accent)))
         return 'additional-accent';
+    const onlyExpressions = [...inserts, ...deletes].every(symbol => symbol.type === 'expression');
+    if (transferred && onlyExpressions && inserted.length + deleted.length > 0)
+        return 'recoding';
     if (inserted.length > 1 && sameSequence(inserted, deleted))
         return 'shift';
     if (inserted.length === 0 && deleted.length === 1)

package/lib/schema.json

@@ -69,11 +69,14 @@
                 {
                     "$ref": "#/definitions/BeliefAdoption"
                 },
+                {
+                    "$ref": "#/definitions/Measurement"
+                },
                 {
                     "$ref": "#/definitions/Argumentation"
                 }
             ],
-            "description": "An argumentation can be either a plain argumentation, a meaning comprehension, an inference, or a belief adoption."
+            "description": "An argumentation can be either a plain argumentation, a meaning comprehension, an inference, a belief adoption or a measurement."
         },
         "AnyFeature": {
             "anyOf": [
@@ -316,8 +319,10 @@
                             "type": "object"
                         },
                         "within": {
+                            "description": "The day the event falls within.",
                             "format": "date",
-                            "type": "string"
+                            "type": "string",
+                            "ontology": "crm:P82 at some time within"
                         }
                     },
                     "required": [
@@ -347,12 +352,16 @@
                             "type": "object"
                         },
                         "after": {
+                            "description": "The earliest day the event can have happened on: it did not happen before it.",
                             "format": "date",
-                            "type": "string"
+                            "type": "string",
+                            "ontology": "crm:P82a begin of the begin"
                         },
                         "before": {
+                            "description": "The latest day the event can have happened on: it did not happen after it.",
                             "format": "date",
-                            "type": "string"
+                            "type": "string",
+                            "ontology": "crm:P82b end of the end"
                         }
                     },
                     "required": [
@@ -382,12 +391,16 @@
                             "type": "object"
                         },
                         "after": {
+                            "description": "The earliest day the event can have happened on: it did not happen before it.",
                             "format": "date",
-                            "type": "string"
+                            "type": "string",
+                            "ontology": "crm:P82a begin of the begin"
                         },
                         "before": {
+                            "description": "The latest day the event can have happened on: it did not happen after it.",
                             "format": "date",
-                            "type": "string"
+                            "type": "string",
+                            "ontology": "crm:P82b end of the end"
                         }
                     },
                     "required": [
@@ -512,11 +525,10 @@
         "EditType": {
             "description": "The type of editorial change applied to a symbol or set of symbols. Classifies the nature of the edit, e.g. whether it corrects an error, adds an accent, shifts a note, or shortens/prolongs a perforation.",
             "enum": [
-                "short-dynamic-differentation",
                 "additional-accent",
                 "add-redundancy",
                 "remove-redundancy",
-                "replace-with-equivalent",
+                "recoding",
                 "shift",
                 "correct-error",
                 "shorten",
@@ -1138,6 +1150,40 @@
             "type": "object",
             "ontology": "crm:E54 Dimension"
         },
+        "Measurement": {
+            "description": "A measurement takes a value off an object by a stated procedure: the period the slot lengths of a copy keep, the median pitch of its held notes. It concludes the belief in that value by itself, with no premises. CRMinf counts observations, and a measurement is one, among the ways a belief comes about, so the value does not have to be passed off as an inference.",
+            "properties": {
+                "actor": {
+                    "$ref": "#/definitions/Person",
+                    "description": "The person who carried out this activity.",
+                    "ontology": "crm:P14 carried out by"
+                },
+                "note": {
+                    "description": "A free-text note providing additional context.",
+                    "type": "string",
+                    "ontology": "crm:P3 has note"
+                },
+                "used": {
+                    "description": "References (by `@id` or URL) to what the measurement was taken on or with, such as the scan, the analysis output or the script.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array",
+                    "ontology": "crm:P16 used specific object"
+                },
+                "@type": {
+                    "const": "measurement",
+                    "type": "string",
+                    "description": "The type discriminator for this object.",
+                    "ontology": "rdf:type"
+                }
+            },
+            "required": [
+                "@type"
+            ],
+            "type": "object",
+            "ontology": "crmsci:S21 Measurement"
+        },
         "Medium": {
             "description": "What a trace was put on with.",
             "enum": [
@@ -1924,6 +1970,106 @@
             ],
             "type": "object"
         },
+        "ObjectAssumption<Concept>": {
+            "anyOf": [
+                {
+                    "properties": {
+                        "@annotation": {
+                            "description": "An optional annotation expressing a belief about this assumption. Uses the JSON-LD-star `@annotation` mechanism to attach epistemic metadata (certainty and reasons) to any triple.",
+                            "properties": {
+                                "belief": {
+                                    "$ref": "#/definitions/Belief",
+                                    "description": "The belief held about the annotated statement.",
+                                    "ontology": "crminf:J4i is subject of"
+                                },
+                                "@id": {
+                                    "description": "A unique identifier for this object.",
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "belief",
+                                "@id"
+                            ],
+                            "type": "object"
+                        },
+                        "name": {
+                            "description": "The name, e.g. \"Grünfeld, Alfred\", \"Wien\", \"M. Welte & Söhne\".",
+                            "type": "string",
+                            "ontology": "rdfs:label"
+                        },
+                        "sameAs": {
+                            "description": "Authority records for the same thing: GND, Wikidata, geonames or similar.",
+                            "examples": [
+                                "https://d-nb.info/gnd/116888652"
+                            ],
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array",
+                            "ontology": "owl:sameAs"
+                        },
+                        "@id": {
+                            "description": "A unique identifier for this object.",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "@id"
+                    ],
+                    "type": "object"
+                },
+                {
+                    "properties": {
+                        "@annotation": {
+                            "description": "An optional annotation expressing a belief about this assumption. Uses the JSON-LD-star `@annotation` mechanism to attach epistemic metadata (certainty and reasons) to any triple.",
+                            "properties": {
+                                "belief": {
+                                    "$ref": "#/definitions/Belief",
+                                    "description": "The belief held about the annotated statement.",
+                                    "ontology": "crminf:J4i is subject of"
+                                },
+                                "@id": {
+                                    "description": "A unique identifier for this object.",
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "belief",
+                                "@id"
+                            ],
+                            "type": "object"
+                        },
+                        "name": {
+                            "description": "The name, e.g. \"Grünfeld, Alfred\", \"Wien\", \"M. Welte & Söhne\".",
+                            "type": "string",
+                            "ontology": "rdfs:label"
+                        },
+                        "sameAs": {
+                            "description": "Authority records for the same thing: GND, Wikidata, geonames or similar.",
+                            "examples": [
+                                "https://d-nb.info/gnd/116888652"
+                            ],
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array",
+                            "ontology": "owl:sameAs"
+                        },
+                        "@id": {
+                            "description": "A unique identifier for this object.",
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "sameAs"
+                    ],
+                    "type": "object"
+                }
+            ],
+            "description": "An object assumption wraps a complex object with an optional annotation. Used for structured values (e.g. persons, conditions) whose properties may be uncertain."
+        },
         "ObjectAssumption<ConditionState<\"general\">>": {
             "description": "An object assumption wraps a complex object with an optional annotation. Used for structured values (e.g. persons, conditions) whose properties may be uncertain.",
             "properties": {
@@ -2700,8 +2846,8 @@
             "description": "Describes the production of a roll copy: the manufacturer, the paper used, the date, and the system and paper speed the copy was cut for.",
             "properties": {
                 "company": {
-                    "$ref": "#/definitions/Agent",
-                    "description": "The company that produced the roll copy (e.g. \"M. Welte & Söhne\").",
+                    "$ref": "#/definitions/ObjectAssumption%3CAgent%3E",
+                    "description": "The company that produced the roll copy (e.g. \"M. Welte & Söhne\"). An object assumption, so that a company read off a box label or adopted from a letter can say where it comes from.",
                     "ontology": "crm:P14 carried out by"
                 },
                 "date": {
@@ -2710,8 +2856,8 @@
                     "ontology": "crm:P4 has time-span"
                 },
                 "paper": {
-                    "$ref": "#/definitions/Concept",
-                    "description": "The paper the roll copy was cut on.",
+                    "$ref": "#/definitions/ObjectAssumption%3CConcept%3E",
+                    "description": "The paper the roll copy was cut on. An object assumption, so that what the paper is taken to be can say how that was found and serve as a premise, e.g. of a dating.",
                     "ontology": "crm:P126 employed"
                 },
                 "perforator": {

package/lib/spec/context.json

@@ -9,6 +9,7 @@
         "crm": "http://www.cidoc-crm.org/cidoc-crm/",
         "crmdig": "http://www.cidoc-crm.org/extensions/crmdig/",
         "crminf": "http://www.cidoc-crm.org/extensions/crminf/",
+        "crmsci": "http://www.cidoc-crm.org/extensions/crmsci/",
         "lrmoo": "http://iflastandards.info/ns/lrm/lrmoo/",
         "reo": "https://w3id.org/reo/",
         "RollCopy": "reo:RollCopy",
@@ -75,6 +76,16 @@
             "@id": "crminf:I16_Meaning_Comprehension",
             "@context": { "note": "crm:P3_has_note" }
         },
+        "measurement": {
+            "@id": "crmsci:S21_Measurement",
+            "@context": {
+                "note": "crm:P3_has_note",
+                "used": {
+                    "@id": "crm:P16_used_specific_object",
+                    "@type": "@id"
+                }
+            }
+        },
         "title": "dcterms:title",
         "license": {
             "@id": "dcterms:license",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linked-rolls",
-  "version": "0.59.0",
+  "version": "0.61.0",
   "description": "Digital editions of piano rolls: import, collation, editorial assumptions, JSON-LD export, and emulation through a reproducing system",
   "license": "MIT",
   "repository": {