document-drive 4.1.0-dev.3 → 4.1.0-dev.30

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.
Files changed (103) hide show
  1. package/dist/index.d.ts +5 -4
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +2 -1
  4. package/dist/index.js.map +1 -1
  5. package/dist/prisma/schema.prisma +1 -0
  6. package/dist/src/cache/types.d.ts.map +1 -1
  7. package/dist/src/drive-document-model/gen/object.d.ts +2 -2
  8. package/dist/src/drive-document-model/gen/object.d.ts.map +1 -1
  9. package/dist/src/drive-document-model/gen/types.d.ts +2 -2
  10. package/dist/src/drive-document-model/gen/types.d.ts.map +1 -1
  11. package/dist/src/drive-document-model/gen/utils.d.ts.map +1 -1
  12. package/dist/src/drive-document-model/gen/utils.js +2 -1
  13. package/dist/src/drive-document-model/gen/utils.js.map +1 -1
  14. package/dist/src/drive-document-model/src/reducers/node.d.ts.map +1 -1
  15. package/dist/src/drive-document-model/src/reducers/node.js +13 -1
  16. package/dist/src/drive-document-model/src/reducers/node.js.map +1 -1
  17. package/dist/src/drive-document-model/src/tests/drive.test.js +7 -7
  18. package/dist/src/drive-document-model/src/tests/drive.test.js.map +1 -1
  19. package/dist/src/drive-document-model/src/tests/generate-mock.d.ts +4 -0
  20. package/dist/src/drive-document-model/src/tests/generate-mock.d.ts.map +1 -0
  21. package/dist/src/drive-document-model/src/tests/generate-mock.js +5 -0
  22. package/dist/src/drive-document-model/src/tests/generate-mock.js.map +1 -0
  23. package/dist/src/drive-document-model/src/tests/node.test.js +60 -68
  24. package/dist/src/drive-document-model/src/tests/node.test.js.map +1 -1
  25. package/dist/src/drive-document-model/src/utils.d.ts +1 -0
  26. package/dist/src/drive-document-model/src/utils.d.ts.map +1 -1
  27. package/dist/src/drive-document-model/src/utils.js +4 -0
  28. package/dist/src/drive-document-model/src/utils.js.map +1 -1
  29. package/dist/src/processors/processor-manager.d.ts.map +1 -1
  30. package/dist/src/processors/processor-manager.js +2 -1
  31. package/dist/src/processors/processor-manager.js.map +1 -1
  32. package/dist/src/processors/types.d.ts +3 -3
  33. package/dist/src/processors/types.d.ts.map +1 -1
  34. package/dist/src/queue/event.d.ts +1 -1
  35. package/dist/src/queue/event.d.ts.map +1 -1
  36. package/dist/src/queue/event.js +8 -3
  37. package/dist/src/queue/event.js.map +1 -1
  38. package/dist/src/server/base-server.d.ts +1 -0
  39. package/dist/src/server/base-server.d.ts.map +1 -1
  40. package/dist/src/server/base-server.js +46 -35
  41. package/dist/src/server/base-server.js.map +1 -1
  42. package/dist/src/server/error.d.ts +5 -1
  43. package/dist/src/server/error.d.ts.map +1 -1
  44. package/dist/src/server/error.js +7 -2
  45. package/dist/src/server/error.js.map +1 -1
  46. package/dist/src/server/listener/listener-manager.d.ts +1 -1
  47. package/dist/src/server/listener/listener-manager.d.ts.map +1 -1
  48. package/dist/src/server/listener/listener-manager.js +5 -4
  49. package/dist/src/server/listener/listener-manager.js.map +1 -1
  50. package/dist/src/server/listener/transmitter/internal.d.ts.map +1 -1
  51. package/dist/src/server/listener/transmitter/internal.js +10 -1
  52. package/dist/src/server/listener/transmitter/internal.js.map +1 -1
  53. package/dist/src/server/listener/transmitter/pull-responder.js +2 -2
  54. package/dist/src/server/listener/transmitter/switchboard-push.d.ts.map +1 -1
  55. package/dist/src/server/listener/transmitter/switchboard-push.js +1 -0
  56. package/dist/src/server/listener/transmitter/switchboard-push.js.map +1 -1
  57. package/dist/src/server/listener/util.d.ts +1 -1
  58. package/dist/src/server/listener/util.d.ts.map +1 -1
  59. package/dist/src/server/listener/util.js +1 -1
  60. package/dist/src/server/listener/util.js.map +1 -1
  61. package/dist/src/server/sync-manager.d.ts.map +1 -1
  62. package/dist/src/server/sync-manager.js +9 -8
  63. package/dist/src/server/sync-manager.js.map +1 -1
  64. package/dist/src/server/types.d.ts +6 -3
  65. package/dist/src/server/types.d.ts.map +1 -1
  66. package/dist/src/server/types.js.map +1 -1
  67. package/dist/src/storage/browser.d.ts.map +1 -1
  68. package/dist/src/storage/browser.js +5 -4
  69. package/dist/src/storage/browser.js.map +1 -1
  70. package/dist/src/storage/filesystem.d.ts.map +1 -1
  71. package/dist/src/storage/filesystem.js +5 -4
  72. package/dist/src/storage/filesystem.js.map +1 -1
  73. package/dist/src/storage/ipfs.d.ts.map +1 -1
  74. package/dist/src/storage/ipfs.js +3 -3
  75. package/dist/src/storage/ipfs.js.map +1 -1
  76. package/dist/src/storage/memory.d.ts.map +1 -1
  77. package/dist/src/storage/memory.js +5 -4
  78. package/dist/src/storage/memory.js.map +1 -1
  79. package/dist/src/storage/prisma/client/edge.js +4 -3
  80. package/dist/src/storage/prisma/client/index-browser.js +1 -0
  81. package/dist/src/storage/prisma/client/index.d.ts +45 -0
  82. package/dist/src/storage/prisma/client/index.js +4 -3
  83. package/dist/src/storage/prisma/client/package.json +1 -1
  84. package/dist/src/storage/prisma/client/schema.prisma +1 -0
  85. package/dist/src/storage/prisma/client/wasm.js +1 -0
  86. package/dist/src/storage/prisma/prisma.d.ts.map +1 -1
  87. package/dist/src/storage/prisma/prisma.js +45 -25
  88. package/dist/src/storage/prisma/prisma.js.map +1 -1
  89. package/dist/src/utils/gql-transformations.d.ts.map +1 -1
  90. package/dist/src/utils/gql-transformations.js +4 -2
  91. package/dist/src/utils/gql-transformations.js.map +1 -1
  92. package/dist/src/utils/graphql.d.ts.map +1 -1
  93. package/dist/src/utils/graphql.js +5 -7
  94. package/dist/src/utils/graphql.js.map +1 -1
  95. package/dist/src/utils/migrations.d.ts.map +1 -1
  96. package/dist/src/utils/migrations.js +82 -17
  97. package/dist/src/utils/migrations.js.map +1 -1
  98. package/dist/src/utils/misc.d.ts +2 -2
  99. package/dist/src/utils/misc.d.ts.map +1 -1
  100. package/dist/src/utils/misc.js +6 -6
  101. package/dist/src/utils/misc.js.map +1 -1
  102. package/dist/tsconfig.lib.tsbuildinfo +1 -1
  103. package/package.json +5 -4
@@ -1,3 +1,4 @@
1
+ /* eslint-disable */
1
2
  export function migrateDocumentOperationSignatures(document) {
2
3
  let legacy = false;
3
4
  const operations = Object.entries(document.operations).reduce((acc, [key, operations]) => {
@@ -11,32 +12,96 @@ export function migrateDocumentOperationSignatures(document) {
11
12
  }
12
13
  return acc;
13
14
  }, { global: [], local: [] });
14
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
15
15
  return legacy ? { ...document, operations } : document;
16
16
  }
17
17
  export function migrateLegacyOperationSignature(operation) {
18
- if (!operation.context?.signer || operation.context.signer.signatures) {
19
- return operation;
18
+ let needsMigration = false;
19
+ let newOperation = { ...operation };
20
+ // Check both top-level context and action.context for legacy signatures
21
+ const topLevelSigner = operation.context?.signer;
22
+ const actionSigner = operation.action?.context?.signer;
23
+ // Handle top-level context migration (legacy structure)
24
+ if (topLevelSigner) {
25
+ if ("signature" in topLevelSigner) {
26
+ const signature = topLevelSigner.signature;
27
+ newOperation = {
28
+ ...newOperation,
29
+ context: {
30
+ ...newOperation.context,
31
+ signer: {
32
+ user: topLevelSigner.user,
33
+ app: topLevelSigner.app,
34
+ signatures: (signature?.length
35
+ ? [signature]
36
+ : []),
37
+ },
38
+ },
39
+ };
40
+ needsMigration = true;
41
+ }
42
+ else if (topLevelSigner.signatures) {
43
+ const cleanSignatures = topLevelSigner.signatures.filter((sig) => sig && sig.length > 0);
44
+ if (cleanSignatures.length !== topLevelSigner.signatures.length) {
45
+ newOperation = {
46
+ ...newOperation,
47
+ context: {
48
+ ...newOperation.context,
49
+ signer: {
50
+ ...topLevelSigner,
51
+ signatures: cleanSignatures,
52
+ },
53
+ },
54
+ };
55
+ needsMigration = true;
56
+ }
57
+ }
20
58
  }
21
- const { signer } = operation.context;
22
- if ("signature" in signer) {
23
- const signature = signer.signature;
24
- return {
25
- ...operation,
26
- context: {
27
- ...operation.context,
59
+ // Handle action.context migration
60
+ if (actionSigner) {
61
+ if ("signature" in actionSigner) {
62
+ const signature = actionSigner.signature;
63
+ const migratedContext = {
64
+ ...newOperation.action.context,
28
65
  signer: {
29
- user: signer.user,
30
- app: signer.app,
66
+ user: actionSigner.user,
67
+ app: actionSigner.app,
31
68
  signatures: (signature?.length
32
69
  ? [signature]
33
70
  : []),
34
71
  },
35
- },
36
- };
37
- }
38
- else {
39
- return operation;
72
+ };
73
+ newOperation = {
74
+ ...newOperation,
75
+ action: {
76
+ ...newOperation.action,
77
+ context: migratedContext,
78
+ },
79
+ context: migratedContext, // Also set top-level context
80
+ };
81
+ needsMigration = true;
82
+ }
83
+ else if (actionSigner.signatures) {
84
+ const cleanSignatures = actionSigner.signatures.filter((sig) => sig && sig.length > 0);
85
+ if (cleanSignatures.length !== actionSigner.signatures.length) {
86
+ const migratedContext = {
87
+ ...newOperation.action.context,
88
+ signer: {
89
+ ...actionSigner,
90
+ signatures: cleanSignatures,
91
+ },
92
+ };
93
+ newOperation = {
94
+ ...newOperation,
95
+ action: {
96
+ ...newOperation.action,
97
+ context: migratedContext,
98
+ },
99
+ context: migratedContext, // Also set top-level context
100
+ };
101
+ needsMigration = true;
102
+ }
103
+ }
40
104
  }
105
+ return needsMigration ? newOperation : operation;
41
106
  }
42
107
  //# sourceMappingURL=migrations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kCAAkC,CAChD,QAAoB;IAEpB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAC/B,QAAQ,CAAC,UAAU,CACpB,CAAC,MAAM,CACN,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,GAAG,CAAC;QAClB,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,+BAA+B,CAAC,EAAE,CAAC,CAAC;YAClD,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACjB,MAAM,GAAG,IAAI,CAAC;YAChB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAC1B,CAAC;IACF,uEAAuE;IACvE,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC7C,SAAoB;IAEpB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACtE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC;IACrC,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,SAA+B,CAAC;QACzD,OAAO;YACL,GAAG,SAAS;YACZ,OAAO,EAAE;gBACP,GAAG,SAAS,CAAC,OAAO;gBACpB,MAAM,EAAE;oBACN,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM;wBAC5B,CAAC,CAAC,CAAC,SAAS,CAAC;wBACb,CAAC,CAAC,EAAE,CAA2B;iBAClC;aACF;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/utils/migrations.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { type Operation, type OperationsFromDocument, type PHDocument } from "document-model";
1
+ import { type DocumentOperations, type Operation, type PHDocument } from "document-model";
2
2
  import { type DocumentDriveDocument } from "#drive-document-model/gen/types";
3
3
  import { type ListenerRevision } from "#server/types";
4
4
  import { pascalCase } from "change-case";
@@ -6,7 +6,7 @@ import { RunAsap } from "./run-asap.js";
6
6
  export declare const runAsap: typeof RunAsap.runAsap;
7
7
  export declare const runAsapAsync: typeof RunAsap.runAsapAsync;
8
8
  export declare function isDocumentDrive(document: PHDocument): document is DocumentDriveDocument;
9
- export declare function mergeOperations(currentOperations: OperationsFromDocument, newOperations: Operation[]): OperationsFromDocument;
9
+ export declare function mergeOperations(currentOperations: DocumentOperations, newOperations: Operation[]): DocumentOperations;
10
10
  export declare function isNoopUpdate(operation: Operation, latestOperation?: Operation): boolean;
11
11
  export declare function isBefore(dateA: Date | string, dateB: Date | string): boolean;
12
12
  export declare function operationsToRevision(operations: Pick<Operation, "index">[] | undefined): ListenerRevision["revision"];
@@ -1 +1 @@
1
- {"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,sBAAsB,EAC3B,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAO,MAAM,OAAO,wBAAkB,CAAC;AACvC,eAAO,MAAM,YAAY,6BAAuB,CAAC;AAEjD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,UAAU,GACnB,QAAQ,IAAI,qBAAqB,CAEnC;AAED,wBAAgB,eAAe,CAC7B,iBAAiB,EAAE,sBAAsB,EACzC,aAAa,EAAE,SAAS,EAAE,GACzB,sBAAsB,CA0BxB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,EACpB,eAAe,CAAC,EAAE,SAAS,WAc5B;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,EAAE,KAAK,EAAE,IAAI,GAAG,MAAM,WAElE;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,GACjD,gBAAgB,CAAC,UAAU,CAAC,CAG9B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,mBAAa,CAAC"}
1
+ {"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAO,MAAM,OAAO,wBAAkB,CAAC;AACvC,eAAO,MAAM,YAAY,6BAAuB,CAAC;AAEjD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,UAAU,GACnB,QAAQ,IAAI,qBAAqB,CAEnC;AAED,wBAAgB,eAAe,CAC7B,iBAAiB,EAAE,kBAAkB,EACrC,aAAa,EAAE,SAAS,EAAE,GACzB,kBAAkB,CA0BpB;AAED,wBAAgB,YAAY,CAC1B,SAAS,EAAE,SAAS,EACpB,eAAe,CAAC,EAAE,SAAS,WAc5B;AAGD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,GAAG,MAAM,EAAE,KAAK,EAAE,IAAI,GAAG,MAAM,WAElE;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,GACjD,gBAAgB,CAAC,UAAU,CAAC,CAG9B;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,mBAAa,CAAC"}
@@ -13,23 +13,23 @@ export function mergeOperations(currentOperations, newOperations) {
13
13
  acc[scope] = currentOperations[scope].at(-1)?.index ?? 0;
14
14
  return acc;
15
15
  }, {});
16
- const conflictOp = newOperations.find((op) => op.index < (minIndexByScope[op.scope] ?? 0));
16
+ const conflictOp = newOperations.find((op) => op.index < (minIndexByScope[op.action.scope] ?? 0));
17
17
  if (conflictOp) {
18
- throw new OperationError("ERROR", conflictOp, `Tried to add operation with index ${conflictOp.index} and document is at index ${minIndexByScope[conflictOp.scope]}`);
18
+ throw new OperationError("ERROR", conflictOp, `Tried to add operation with index ${conflictOp.index} and document is at index ${minIndexByScope[conflictOp.action.scope]}`);
19
19
  }
20
20
  return newOperations
21
21
  .sort((a, b) => a.index - b.index)
22
22
  .reduce((acc, curr) => {
23
- const existingOperations = acc[curr.scope] || [];
24
- return { ...acc, [curr.scope]: [...existingOperations, curr] };
23
+ const existingOperations = acc[curr.action.scope] || [];
24
+ return { ...acc, [curr.action.scope]: [...existingOperations, curr] };
25
25
  }, currentOperations);
26
26
  }
27
27
  export function isNoopUpdate(operation, latestOperation) {
28
28
  if (!latestOperation) {
29
29
  return false;
30
30
  }
31
- const isNoopOp = operation.type === "NOOP";
32
- const isNoopLatestOp = latestOperation.type === "NOOP";
31
+ const isNoopOp = operation.action.type === "NOOP";
32
+ const isNoopLatestOp = latestOperation.action.type === "NOOP";
33
33
  const isSameIndexOp = operation.index === latestOperation.index;
34
34
  const isSkipOpGreaterThanLatestOp = operation.skip > latestOperation.skip;
35
35
  return (isNoopOp && isNoopLatestOp && isSameIndexOp && isSkipOpGreaterThanLatestOp);
@@ -1 +1 @@
1
- {"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../src/utils/misc.ts"],"names":[],"mappings":"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"}