@manuscripts/track-changes-plugin 0.4.6 → 1.0.1-LEAN-1697

package/dist/actions.d.ts

@@ -24,7 +24,7 @@ export declare enum TrackChangesAction {
     refreshChanges = "track-changes-refresh-changes",
     applyAndRemoveChanges = "track-changes-apply-remove-changes"
 }
-export declare type TrackChangesActionParams = {
+export type TrackChangesActionParams = {
     [TrackChangesAction.skipTrack]: boolean;
     [TrackChangesAction.setUserID]: string;
     [TrackChangesAction.setPluginStatus]: TrackChangesStatus;

package/dist/index.cjs

@@ -1195,23 +1195,21 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceStep(step, oldState, newTr, attrs) {
+function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
     let selectionPos = 0, changeSteps = [];
+    // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
-        // Invert the transaction step to prevent it from actually deleting or inserting anything
-        const newStep = step.invert(oldState.doc);
-        const stepResult = newTr.maybeStep(newStep);
-        if (stepResult.failed) {
-            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`, newStep);
-            return;
-        }
         log.info('TR: steps before applying delete', [...newTr.steps]);
         // First apply the deleted range and update the insert slice to not include content that was deleted,
         // eg partial nodes in an open-ended slice
-        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, oldState.doc, newTr, oldState.schema, attrs, slice);
+        if (stepResult.failed) {
+            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`);
+            return;
+        }
+        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, currentStepDoc, newTr, oldState.schema, attrs, slice);
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
@@ -1395,7 +1393,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.set_node_attributes);
+            const oldUpdate = oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.set_node_attributes && d.status === exports.CHANGE_STATUS.pending);
             const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
             const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
             const newUpdate = oldUpdate
@@ -1635,6 +1633,7 @@ const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.n
  * @returns newTr that inverts the initial tr and applies track attributes/marks
  */
 function trackTransaction(tr, oldState, newTr, authorID) {
+    var _a, _b, _c, _d;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -1647,33 +1646,35 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     const wasNodeSelection = tr.selection instanceof prosemirrorState.NodeSelection;
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
-    tr.steps.forEach((step) => {
-        var _a, _b, _c, _d;
+    for (let i = tr.steps.length - 1; i >= 0; i--) {
+        const step = tr.steps[i];
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
             console.error('@manuscripts/track-changes-plugin: Possible infinite loop in iterating tr.steps, tracking skipped!\n' +
                 'This is probably an error with the library, please report back to maintainers with a reproduction if possible', newTr);
-            return;
+            continue;
         }
         else if (!(step instanceof prosemirrorTransform.ReplaceStep) && step.constructor.name === 'ReplaceStep') {
             console.error('@manuscripts/track-changes-plugin: Multiple prosemirror-transform packages imported, alias/dedupe them ' +
                 'or instanceof checks fail as well as creating new steps');
-            return;
+            continue;
         }
         else if (step instanceof prosemirrorTransform.ReplaceStep) {
             const { slice } = step;
             if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 &&
                 isHighlightMarkerNode(slice.content.content[0])) {
                 // don't track highlight marker nodes
-                return;
+                continue;
             }
-            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            const newStep = step.invert(tr.docs[i]);
+            const stepResult = newTr.maybeStep(newStep);
+            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
                 const step = steps[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
                     // don't track deleted highlight marker nodes
-                    return;
+                    continue;
                 }
             }
             log.info('CHANGES: ', steps);
@@ -1713,7 +1714,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         // after track-changes plugin.
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
-    });
+    }
     // This is kinda hacky solution at the moment to maintain NodeSelections over transactions
     // These are required by at least cross-references and links to activate their selector pop-ups
     if (wasNodeSelection) {

package/dist/index.js

@@ -1187,23 +1187,21 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceStep(step, oldState, newTr, attrs) {
+function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
     let selectionPos = 0, changeSteps = [];
+    // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
-        // Invert the transaction step to prevent it from actually deleting or inserting anything
-        const newStep = step.invert(oldState.doc);
-        const stepResult = newTr.maybeStep(newStep);
-        if (stepResult.failed) {
-            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`, newStep);
-            return;
-        }
         log.info('TR: steps before applying delete', [...newTr.steps]);
         // First apply the deleted range and update the insert slice to not include content that was deleted,
         // eg partial nodes in an open-ended slice
-        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, oldState.doc, newTr, oldState.schema, attrs, slice);
+        if (stepResult.failed) {
+            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`);
+            return;
+        }
+        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, currentStepDoc, newTr, oldState.schema, attrs, slice);
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
@@ -1387,7 +1385,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes);
+            const oldUpdate = oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes && d.status === CHANGE_STATUS.pending);
             const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
             const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
             const newUpdate = oldUpdate
@@ -1627,6 +1625,7 @@ const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.n
  * @returns newTr that inverts the initial tr and applies track attributes/marks
  */
 function trackTransaction(tr, oldState, newTr, authorID) {
+    var _a, _b, _c, _d;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -1639,33 +1638,35 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     const wasNodeSelection = tr.selection instanceof NodeSelection;
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
-    tr.steps.forEach((step) => {
-        var _a, _b, _c, _d;
+    for (let i = tr.steps.length - 1; i >= 0; i--) {
+        const step = tr.steps[i];
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
             console.error('@manuscripts/track-changes-plugin: Possible infinite loop in iterating tr.steps, tracking skipped!\n' +
                 'This is probably an error with the library, please report back to maintainers with a reproduction if possible', newTr);
-            return;
+            continue;
         }
         else if (!(step instanceof ReplaceStep) && step.constructor.name === 'ReplaceStep') {
             console.error('@manuscripts/track-changes-plugin: Multiple prosemirror-transform packages imported, alias/dedupe them ' +
                 'or instanceof checks fail as well as creating new steps');
-            return;
+            continue;
         }
         else if (step instanceof ReplaceStep) {
             const { slice } = step;
             if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 &&
                 isHighlightMarkerNode(slice.content.content[0])) {
                 // don't track highlight marker nodes
-                return;
+                continue;
             }
-            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            const newStep = step.invert(tr.docs[i]);
+            const stepResult = newTr.maybeStep(newStep);
+            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
                 const step = steps[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
                     // don't track deleted highlight marker nodes
-                    return;
+                    continue;
                 }
             }
             log.info('CHANGES: ', steps);
@@ -1705,7 +1706,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         // after track-changes plugin.
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
-    });
+    }
     // This is kinda hacky solution at the moment to maintain NodeSelections over transactions
     // These are required by at least cross-references and links to activate their selector pop-ups
     if (wasNodeSelection) {

package/dist/steps/trackReplaceStep.d.ts

@@ -1,5 +1,21 @@
+/*!
+ * © 2021 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Node as PMNode } from 'prosemirror-model';
 import type { EditorState, Transaction } from 'prosemirror-state';
-import { ReplaceStep } from 'prosemirror-transform';
+import { ReplaceStep, StepResult } from 'prosemirror-transform';
 import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
-export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs): [ChangeStep[], number];
+export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs, stepResult: StepResult, currentStepDoc: PMNode): [ChangeStep[], number];

package/dist/types/change.d.ts

@@ -23,7 +23,7 @@ export declare enum CHANGE_STATUS {
     rejected = "rejected",
     pending = "pending"
 }
-declare type InsertDeleteAttrs = {
+type InsertDeleteAttrs = {
     id: string;
     authorID: string;
     reviewedByID: string | null;
@@ -32,45 +32,45 @@ declare type InsertDeleteAttrs = {
     createdAt: number;
     updatedAt: number;
 };
-export declare type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
+export type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.set_node_attributes;
     oldAttrs: Record<string, any>;
 };
-export declare type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs;
-declare type Change = {
+export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs;
+type Change = {
     id: string;
     from: number;
     to: number;
     dataTracked: TrackedAttrs;
 };
-export declare type TextChange = Change & {
+export type TextChange = Change & {
     type: 'text-change';
     text: string;
 };
-export declare type NodeChange = Change & {
+export type NodeChange = Change & {
     type: 'node-change';
     nodeType: string;
     children: TrackedChange[];
 };
-export declare type NodeAttrChange = Change & {
+export type NodeAttrChange = Change & {
     type: 'node-attr-change';
     nodeType: string;
     oldAttrs: Record<string, any>;
     newAttrs: Record<string, any>;
 };
-export declare type WrapChange = Change & {
+export type WrapChange = Change & {
     type: 'wrap-change';
     wrapperNode: string;
 };
-export declare type MarkChange = Change & {
+export type MarkChange = Change & {
     type: 'mark-change';
 };
-export declare type TrackedChange = TextChange | NodeChange | NodeAttrChange | WrapChange | MarkChange;
-export declare type PartialChange<T extends TrackedChange> = Omit<T, 'dataTracked'> & {
+export type TrackedChange = TextChange | NodeChange | NodeAttrChange | WrapChange | MarkChange;
+export type PartialChange<T extends TrackedChange> = Omit<T, 'dataTracked'> & {
     dataTracked: Partial<TrackedAttrs>;
 };
-export declare type IncompleteChange = Omit<TrackedChange, 'dataTracked'> & {
+export type IncompleteChange = Omit<TrackedChange, 'dataTracked'> & {
     dataTracked: Partial<TrackedAttrs>;
 };
-export declare type ChangeType = TrackedChange['type'];
+export type ChangeType = TrackedChange['type'];
 export {};

package/dist/types/pm.d.ts

@@ -15,13 +15,13 @@
  */
 import { Fragment, Node as PMNode, Slice } from 'prosemirror-model';
 import { ReplaceStep } from 'prosemirror-transform';
-export declare type ExposedReplaceStep = ReplaceStep & {
+export type ExposedReplaceStep = ReplaceStep & {
     slice: ExposedSlice;
 };
-export declare type ExposedSlice = Slice & {
+export type ExposedSlice = Slice & {
     content: ExposedFragment;
     insertAt(pos: number, fragment: Fragment | ExposedFragment): ExposedSlice;
 };
-export declare type ExposedFragment = Fragment & {
+export type ExposedFragment = Fragment & {
     content: PMNode[];
 };

package/dist/types/step.d.ts

@@ -50,4 +50,4 @@ export interface UpdateNodeAttrsStep {
     node: PMNode;
     newAttrs: Record<string, any>;
 }
-export declare type ChangeStep = DeleteNodeStep | DeleteTextStep | MergeFragmentStep | InsertSliceStep | UpdateNodeAttrsStep;
+export type ChangeStep = DeleteNodeStep | DeleteTextStep | MergeFragmentStep | InsertSliceStep | UpdateNodeAttrsStep;

package/dist/types/track.d.ts

@@ -26,18 +26,18 @@ export interface TrackChangesState {
     userID: string;
     changeSet: ChangeSet;
 }
-export declare type NewEmptyAttrs = Omit<TrackedAttrs, 'id' | 'operation'>;
-export declare type NewInsertAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
+export type NewEmptyAttrs = Omit<TrackedAttrs, 'id' | 'operation'>;
+export type NewInsertAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.insert;
 };
-export declare type NewDeleteAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
+export type NewDeleteAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.delete;
 };
-export declare type NewUpdateAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
+export type NewUpdateAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.set_node_attributes;
     oldAttrs: Record<string, any>;
 };
-export declare type NewTrackedAttrs = NewInsertAttrs | NewDeleteAttrs | NewUpdateAttrs;
+export type NewTrackedAttrs = NewInsertAttrs | NewDeleteAttrs | NewUpdateAttrs;
 export declare enum TrackChangesStatus {
     enabled = "enabled",
     viewSnapshots = "view-snapshots",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "0.4.6",
+  "version": "1.0.1-LEAN-1697",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -23,8 +23,19 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "rollup -c",
+    "watch": "rollup -cw",
+    "test": "jest --runInBand",
+    "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
+    "typecheck": "tsc --project tsconfig.test.json --noEmit",
+    "lint": "eslint --cache --ext .js,.ts, ./src ./test",
+    "lint:fix": "eslint --fix --ext .js,.ts, ./src ./test"
+  },
   "devDependencies": {
-    "@manuscripts/manuscript-transform": "^0.54.0",
+    "@manuscripts/data": "^0.1.12",
+    "@manuscripts/json-schema": "^1.1.0",
+    "@manuscripts/transform": "^1.0.1",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@types/debug": "^4.1.7",
     "@types/jest": "27.5.1",
@@ -32,15 +43,15 @@
     "jest": "27.5.1",
     "jest-environment-jsdom": "27.5.1",
     "jsdom": "^20.0.0",
-    "prosemirror-commands": "^1.3.1",
+    "prosemirror-commands": "^1.5.0",
     "prosemirror-example-setup": "^1.2.1",
     "prosemirror-history": "^1.3.0",
     "prosemirror-keymap": "^1.2.0",
-    "prosemirror-model": "^1.18.1",
+    "prosemirror-model": "^1.18.3",
     "prosemirror-schema-list": "^1.2.2",
-    "prosemirror-state": "^1.4.1",
+    "prosemirror-state": "^1.4.2",
     "prosemirror-transform": "^1.7.0",
-    "prosemirror-view": "^1.28.1",
+    "prosemirror-view": "^1.29.1",
     "rollup": "^2.79.0",
     "rollup-plugin-typescript2": "^0.34.0",
     "ts-jest": "27.1.4",
@@ -55,14 +66,5 @@
   },
   "dependencies": {
     "debug": "^4.3.4"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "watch": "rollup -cw",
-    "test": "jest --runInBand",
-    "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
-    "typecheck": "tsc --project tsconfig.test.json --noEmit",
-    "lint": "eslint --cache --ext .js,.ts, ./src ./test",
-    "lint:fix": "eslint --fix --ext .js,.ts, ./src ./test"
   }
-}
+}

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2021] [Atypon Systems LLC]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.