@imbricate/core 3.15.0 → 3.15.2

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.
@@ -48,7 +48,8 @@ export type ImbricateDocumentQuery = {
48
48
  export declare enum IMBRICATE_DATABASE_EDIT_TYPE {
49
49
  PUT_SCHEMA = "PUT_SCHEMA",
50
50
  PUT_ANNOTATION = "PUT_ANNOTATION",
51
- DELETE_ANNOTATION = "DELETE_ANNOTATION"
51
+ DELETE_ANNOTATION = "DELETE_ANNOTATION",
52
+ RESOLVE_CONFLICT = "RESOLVE_CONFLICT"
52
53
  }
53
54
  export type DatabaseEditOperationPutAnnotation = {
54
55
  readonly annotationNamespace: string;
@@ -59,7 +60,10 @@ export type DatabaseEditOperationDeleteAnnotation = {
59
60
  readonly annotationNamespace: string;
60
61
  readonly annotationIdentifier: string;
61
62
  };
62
- export type DatabaseEditOperationValue<T extends IMBRICATE_DATABASE_EDIT_TYPE> = T extends IMBRICATE_DATABASE_EDIT_TYPE.PUT_SCHEMA ? ImbricateDatabaseSchema : T extends IMBRICATE_DATABASE_EDIT_TYPE.PUT_ANNOTATION ? DatabaseEditOperationPutAnnotation : T extends IMBRICATE_DATABASE_EDIT_TYPE.DELETE_ANNOTATION ? DatabaseEditOperationDeleteAnnotation : never;
63
+ export type DatabaseEditOperationResolveConflict = {
64
+ readonly conflicetedEditRecords: string[];
65
+ };
66
+ export type DatabaseEditOperationValue<T extends IMBRICATE_DATABASE_EDIT_TYPE> = T extends IMBRICATE_DATABASE_EDIT_TYPE.PUT_SCHEMA ? ImbricateDatabaseSchema : T extends IMBRICATE_DATABASE_EDIT_TYPE.PUT_ANNOTATION ? DatabaseEditOperationPutAnnotation : T extends IMBRICATE_DATABASE_EDIT_TYPE.DELETE_ANNOTATION ? DatabaseEditOperationDeleteAnnotation : T extends IMBRICATE_DATABASE_EDIT_TYPE.RESOLVE_CONFLICT ? DatabaseEditOperationResolveConflict : never;
63
67
  /**
64
68
  * Edit operation of the database
65
69
  */
@@ -28,4 +28,5 @@ var IMBRICATE_DATABASE_EDIT_TYPE;
28
28
  IMBRICATE_DATABASE_EDIT_TYPE["PUT_SCHEMA"] = "PUT_SCHEMA";
29
29
  IMBRICATE_DATABASE_EDIT_TYPE["PUT_ANNOTATION"] = "PUT_ANNOTATION";
30
30
  IMBRICATE_DATABASE_EDIT_TYPE["DELETE_ANNOTATION"] = "DELETE_ANNOTATION";
31
+ IMBRICATE_DATABASE_EDIT_TYPE["RESOLVE_CONFLICT"] = "RESOLVE_CONFLICT";
31
32
  })(IMBRICATE_DATABASE_EDIT_TYPE || (exports.IMBRICATE_DATABASE_EDIT_TYPE = IMBRICATE_DATABASE_EDIT_TYPE = {}));
@@ -11,7 +11,8 @@ import { DocumentPropertyKey, DocumentPropertyValue, IMBRICATE_PROPERTY_TYPE } f
11
11
  export declare enum IMBRICATE_DOCUMENT_EDIT_TYPE {
12
12
  PUT_PROPERTY = "PUT_PROPERTY",
13
13
  PUT_ANNOTATION = "PUT_ANNOTATION",
14
- DELETE_ANNOTATION = "DELETE_ANNOTATION"
14
+ DELETE_ANNOTATION = "DELETE_ANNOTATION",
15
+ RESOLVE_CONFLICT = "RESOLVE_CONFLICT"
15
16
  }
16
17
  export type DocumentEditOperationValuePutProperty = {
17
18
  readonly key: DocumentPropertyKey;
@@ -26,7 +27,10 @@ export type DocumentEditOperationDeleteAnnotation = {
26
27
  readonly annotationNamespace: string;
27
28
  readonly annotationIdentifier: string;
28
29
  };
29
- export type DocumentEditOperationValue<T extends IMBRICATE_DOCUMENT_EDIT_TYPE> = T extends IMBRICATE_DOCUMENT_EDIT_TYPE.PUT_PROPERTY ? DocumentEditOperationValuePutProperty : T extends IMBRICATE_DOCUMENT_EDIT_TYPE.PUT_ANNOTATION ? DocumentEditOperationPutAnnotation : T extends IMBRICATE_DOCUMENT_EDIT_TYPE.DELETE_ANNOTATION ? DocumentEditOperationDeleteAnnotation : never;
30
+ export type DocumentEditOperationResolveConflict = {
31
+ readonly conflicetedEditRecords: string[];
32
+ };
33
+ export type DocumentEditOperationValue<T extends IMBRICATE_DOCUMENT_EDIT_TYPE> = T extends IMBRICATE_DOCUMENT_EDIT_TYPE.PUT_PROPERTY ? DocumentEditOperationValuePutProperty : T extends IMBRICATE_DOCUMENT_EDIT_TYPE.PUT_ANNOTATION ? DocumentEditOperationPutAnnotation : T extends IMBRICATE_DOCUMENT_EDIT_TYPE.DELETE_ANNOTATION ? DocumentEditOperationDeleteAnnotation : T extends IMBRICATE_DOCUMENT_EDIT_TYPE.RESOLVE_CONFLICT ? DocumentEditOperationResolveConflict : never;
30
34
  export type DocumentEditOperation<T extends IMBRICATE_DOCUMENT_EDIT_TYPE> = {
31
35
  readonly action: T;
32
36
  readonly value: DocumentEditOperationValue<T>;
@@ -14,4 +14,5 @@ var IMBRICATE_DOCUMENT_EDIT_TYPE;
14
14
  IMBRICATE_DOCUMENT_EDIT_TYPE["PUT_PROPERTY"] = "PUT_PROPERTY";
15
15
  IMBRICATE_DOCUMENT_EDIT_TYPE["PUT_ANNOTATION"] = "PUT_ANNOTATION";
16
16
  IMBRICATE_DOCUMENT_EDIT_TYPE["DELETE_ANNOTATION"] = "DELETE_ANNOTATION";
17
+ IMBRICATE_DOCUMENT_EDIT_TYPE["RESOLVE_CONFLICT"] = "RESOLVE_CONFLICT";
17
18
  })(IMBRICATE_DOCUMENT_EDIT_TYPE || (exports.IMBRICATE_DOCUMENT_EDIT_TYPE = IMBRICATE_DOCUMENT_EDIT_TYPE = {}));
@@ -13,9 +13,9 @@ const getImbricateDefaultValueOfProperty = (type) => {
13
13
  case property_1.IMBRICATE_PROPERTY_TYPE.BOOLEAN: return false;
14
14
  case property_1.IMBRICATE_PROPERTY_TYPE.STRING: return "";
15
15
  case property_1.IMBRICATE_PROPERTY_TYPE.NUMBER: return 0;
16
- case property_1.IMBRICATE_PROPERTY_TYPE.MARKDOWN: return [];
17
- case property_1.IMBRICATE_PROPERTY_TYPE.JSON: return [];
18
- case property_1.IMBRICATE_PROPERTY_TYPE.IMBRISCRIPT: return [];
16
+ case property_1.IMBRICATE_PROPERTY_TYPE.MARKDOWN: return "";
17
+ case property_1.IMBRICATE_PROPERTY_TYPE.JSON: return "";
18
+ case property_1.IMBRICATE_PROPERTY_TYPE.IMBRISCRIPT: return "";
19
19
  case property_1.IMBRICATE_PROPERTY_TYPE.DATE: return new Date().toISOString();
20
20
  case property_1.IMBRICATE_PROPERTY_TYPE.LABEL: return [];
21
21
  case property_1.IMBRICATE_PROPERTY_TYPE.REFERENCE: return [];
@@ -68,4 +68,4 @@ export type DocumentPropertyValueObjectReference = {
68
68
  readonly databaseUniqueIdentifier: string;
69
69
  readonly documentUniqueIdentifier: string;
70
70
  };
71
- export type DocumentPropertyValueObject<T extends IMBRICATE_PROPERTY_TYPE> = T extends IMBRICATE_PROPERTY_TYPE.BOOLEAN ? boolean : T extends IMBRICATE_PROPERTY_TYPE.STRING ? string : T extends IMBRICATE_PROPERTY_TYPE.NUMBER ? number : T extends IMBRICATE_PROPERTY_TYPE.MARKDOWN ? string[] : T extends IMBRICATE_PROPERTY_TYPE.JSON ? string[] : T extends IMBRICATE_PROPERTY_TYPE.IMBRISCRIPT ? string[] : T extends IMBRICATE_PROPERTY_TYPE.DATE ? string : T extends IMBRICATE_PROPERTY_TYPE.LABEL ? string[] : T extends IMBRICATE_PROPERTY_TYPE.REFERENCE ? DocumentPropertyValueObjectReference[] : never;
71
+ export type DocumentPropertyValueObject<T extends IMBRICATE_PROPERTY_TYPE> = T extends IMBRICATE_PROPERTY_TYPE.BOOLEAN ? boolean : T extends IMBRICATE_PROPERTY_TYPE.STRING ? string : T extends IMBRICATE_PROPERTY_TYPE.NUMBER ? number : T extends IMBRICATE_PROPERTY_TYPE.MARKDOWN ? string : T extends IMBRICATE_PROPERTY_TYPE.JSON ? string : T extends IMBRICATE_PROPERTY_TYPE.IMBRISCRIPT ? string : T extends IMBRICATE_PROPERTY_TYPE.DATE ? string : T extends IMBRICATE_PROPERTY_TYPE.LABEL ? string[] : T extends IMBRICATE_PROPERTY_TYPE.REFERENCE ? DocumentPropertyValueObjectReference[] : never;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@imbricate/core",
3
3
  "main": "index.js",
4
- "version": "3.15.0",
4
+ "version": "3.15.2",
5
5
  "description": "Imbricate Core, Notebook for Engineers",
6
6
  "repository": {
7
7
  "type": "git",