@pluv/crdt 2.1.0 → 2.2.1

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/crdt@2.1.0 build /home/runner/work/pluv/pluv/packages/crdt
+> @pluv/crdt@2.2.1 build /home/runner/work/pluv/pluv/packages/crdt
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 1.51 KB
-ESM ⚡️ Build success in 24ms
-CJS dist/index.js 2.63 KB
-CJS ⚡️ Build success in 24ms
+ESM dist/index.mjs 1.55 KB
+ESM ⚡️ Build success in 21ms
+CJS dist/index.js 2.68 KB
+CJS ⚡️ Build success in 22ms
 DTS Build start
-DTS ⚡️ Build success in 532ms
-DTS dist/index.d.mts 2.78 KB
-DTS dist/index.d.ts  2.78 KB
+DTS ⚡️ Build success in 519ms
+DTS dist/index.d.mts 2.64 KB
+DTS dist/index.d.ts  2.64 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pluv/crdt
 
+## 2.2.1
+
+### Patch Changes
+
+- @pluv/types@2.2.1
+
+## 2.2.0
+
+### Patch Changes
+
+- @pluv/types@2.2.0
+
 ## 2.1.0
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,26 +1,17 @@
-import { Json, CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
-export { CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
+import { CrdtType, CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
+export { CrdtDocLike, CrdtType, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson } from '@pluv/types';
 
-type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<TValue, "__pluvType"> & {
-    __pluvType: () => TJson;
-};
-type InferCrdtJson<T extends unknown> = T extends CrdtType<any, infer IJson> ? InferCrdtJson<IJson> : T extends Record<string, any> ? {
-    [P in keyof T]: InferCrdtJson<T[P]>;
-} : T extends (infer IJson)[] ? InferCrdtJson<IJson>[] : T extends readonly (infer IJson)[] ? readonly InferCrdtJson<IJson>[] : T extends Json ? T : string;
-type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any>> = TFactory["_initialStorage"];
-type InferStorage<TFactory extends AbstractCrdtDocFactory<any>> = ReturnType<InferInitialStorageFn<TFactory>>;
-type InferBuilder<TFactory extends AbstractCrdtDocFactory<any>> = Parameters<InferInitialStorageFn<TFactory>>[0];
-
-declare abstract class AbstractCrdtDocFactory<TStorage extends Record<string, CrdtType<any, any>>> {
+declare abstract class AbstractCrdtDocFactory<TDoc extends any, TStorage extends Record<string, CrdtType<any, any>>> {
     _initialStorage: (builder: any) => TStorage;
     constructor(initialStorage: (builder: any) => TStorage);
-    abstract getEmpty(): CrdtDocLike<TStorage>;
-    abstract getFactory(initialStorage?: (builder: any) => TStorage): AbstractCrdtDocFactory<TStorage>;
-    abstract getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TStorage>;
+    abstract getEmpty(): CrdtDocLike<TDoc, TStorage>;
+    abstract getFactory(initialStorage?: (builder: any) => TStorage): AbstractCrdtDocFactory<TDoc, TStorage>;
+    abstract getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TDoc, TStorage>;
     resolveEncodedState(updates: string | string[] | readonly string[]): string | null;
 }
 
-declare class NoopCrdtDoc implements CrdtDocLike<any> {
+declare class NoopCrdtDoc implements CrdtDocLike<any, any> {
+    value: any;
     applyEncodedState(params: DocApplyEncodedStateParams): this;
     batchApplyEncodedState(params: DocBatchApplyEncodedStateParams): this;
     canRedo(): boolean;
@@ -32,14 +23,14 @@ declare class NoopCrdtDoc implements CrdtDocLike<any> {
     isEmpty(): boolean;
     rebuildStorage(): this;
     redo(): this;
-    subscribe(listener: (params: DocSubscribeCallbackParams<any>) => void): () => void;
+    subscribe(listener: (params: DocSubscribeCallbackParams<any, any>) => void): () => void;
     toJson(): any;
     track(): this;
     transact(fn: () => void, origin?: string | undefined): this;
     undo(): this;
 }
 
-declare class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any> {
+declare class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any, any> {
     constructor(initialStorage?: () => {});
     getEmpty(): NoopCrdtDoc;
     getFactory(initialStorage?: ((builder: any) => any) | undefined): NoopCrdtDocFactory;
@@ -50,4 +41,10 @@ declare const noop: {
     doc: (args?: any) => NoopCrdtDocFactory;
 };
 
-export { AbstractCrdtDocFactory, type CrdtType, type InferBuilder, type InferCrdtJson, type InferInitialStorageFn, type InferStorage, NoopCrdtDoc, NoopCrdtDocFactory, noop };
+type InferDoc<TFactory extends AbstractCrdtDocFactory<any, any>> = InferDocLike<TFactory>["value"];
+type InferDocLike<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<TFactory["getInitialized"]>;
+type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any, any>> = TFactory["_initialStorage"];
+type InferStorage<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<InferInitialStorageFn<TFactory>>;
+type InferBuilder<TFactory extends AbstractCrdtDocFactory<any, any>> = Parameters<InferInitialStorageFn<TFactory>>[0];
+
+export { AbstractCrdtDocFactory, type InferBuilder, type InferDoc, type InferDocLike, type InferInitialStorageFn, type InferStorage, NoopCrdtDoc, NoopCrdtDocFactory, noop };

package/dist/index.d.ts

@@ -1,26 +1,17 @@
-import { Json, CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
-export { CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
+import { CrdtType, CrdtDocLike, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams } from '@pluv/types';
+export { CrdtDocLike, CrdtType, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson } from '@pluv/types';
 
-type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<TValue, "__pluvType"> & {
-    __pluvType: () => TJson;
-};
-type InferCrdtJson<T extends unknown> = T extends CrdtType<any, infer IJson> ? InferCrdtJson<IJson> : T extends Record<string, any> ? {
-    [P in keyof T]: InferCrdtJson<T[P]>;
-} : T extends (infer IJson)[] ? InferCrdtJson<IJson>[] : T extends readonly (infer IJson)[] ? readonly InferCrdtJson<IJson>[] : T extends Json ? T : string;
-type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any>> = TFactory["_initialStorage"];
-type InferStorage<TFactory extends AbstractCrdtDocFactory<any>> = ReturnType<InferInitialStorageFn<TFactory>>;
-type InferBuilder<TFactory extends AbstractCrdtDocFactory<any>> = Parameters<InferInitialStorageFn<TFactory>>[0];
-
-declare abstract class AbstractCrdtDocFactory<TStorage extends Record<string, CrdtType<any, any>>> {
+declare abstract class AbstractCrdtDocFactory<TDoc extends any, TStorage extends Record<string, CrdtType<any, any>>> {
     _initialStorage: (builder: any) => TStorage;
     constructor(initialStorage: (builder: any) => TStorage);
-    abstract getEmpty(): CrdtDocLike<TStorage>;
-    abstract getFactory(initialStorage?: (builder: any) => TStorage): AbstractCrdtDocFactory<TStorage>;
-    abstract getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TStorage>;
+    abstract getEmpty(): CrdtDocLike<TDoc, TStorage>;
+    abstract getFactory(initialStorage?: (builder: any) => TStorage): AbstractCrdtDocFactory<TDoc, TStorage>;
+    abstract getInitialized(initialStorage?: (builder: any) => TStorage): CrdtDocLike<TDoc, TStorage>;
     resolveEncodedState(updates: string | string[] | readonly string[]): string | null;
 }
 
-declare class NoopCrdtDoc implements CrdtDocLike<any> {
+declare class NoopCrdtDoc implements CrdtDocLike<any, any> {
+    value: any;
     applyEncodedState(params: DocApplyEncodedStateParams): this;
     batchApplyEncodedState(params: DocBatchApplyEncodedStateParams): this;
     canRedo(): boolean;
@@ -32,14 +23,14 @@ declare class NoopCrdtDoc implements CrdtDocLike<any> {
     isEmpty(): boolean;
     rebuildStorage(): this;
     redo(): this;
-    subscribe(listener: (params: DocSubscribeCallbackParams<any>) => void): () => void;
+    subscribe(listener: (params: DocSubscribeCallbackParams<any, any>) => void): () => void;
     toJson(): any;
     track(): this;
     transact(fn: () => void, origin?: string | undefined): this;
     undo(): this;
 }
 
-declare class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any> {
+declare class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any, any> {
     constructor(initialStorage?: () => {});
     getEmpty(): NoopCrdtDoc;
     getFactory(initialStorage?: ((builder: any) => any) | undefined): NoopCrdtDocFactory;
@@ -50,4 +41,10 @@ declare const noop: {
     doc: (args?: any) => NoopCrdtDocFactory;
 };
 
-export { AbstractCrdtDocFactory, type CrdtType, type InferBuilder, type InferCrdtJson, type InferInitialStorageFn, type InferStorage, NoopCrdtDoc, NoopCrdtDocFactory, noop };
+type InferDoc<TFactory extends AbstractCrdtDocFactory<any, any>> = InferDocLike<TFactory>["value"];
+type InferDocLike<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<TFactory["getInitialized"]>;
+type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any, any>> = TFactory["_initialStorage"];
+type InferStorage<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<InferInitialStorageFn<TFactory>>;
+type InferBuilder<TFactory extends AbstractCrdtDocFactory<any, any>> = Parameters<InferInitialStorageFn<TFactory>>[0];
+
+export { AbstractCrdtDocFactory, type InferBuilder, type InferDoc, type InferDocLike, type InferInitialStorageFn, type InferStorage, NoopCrdtDoc, NoopCrdtDocFactory, noop };

package/dist/index.js

@@ -41,6 +41,9 @@ var AbstractCrdtDocFactory = class {
 
 // src/NoopCrdtDoc.ts
 var NoopCrdtDoc = class {
+  constructor() {
+    this.value = null;
+  }
   applyEncodedState(params) {
     return this;
   }

package/dist/index.mjs

@@ -12,6 +12,9 @@ var AbstractCrdtDocFactory = class {
 
 // src/NoopCrdtDoc.ts
 var NoopCrdtDoc = class {
+  constructor() {
+    this.value = null;
+  }
   applyEncodedState(params) {
     return this;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/crdt",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "crdt base for @pluv/io",
   "author": "leedavidcs",
   "license": "MIT",
@@ -17,14 +17,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@pluv/types": "^2.1.0"
+    "@pluv/types": "^2.2.1"
   },
   "devDependencies": {
     "eslint": "^9.26.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^2.1.0",
-    "eslint-config-pluv": "^2.1.0"
+    "@pluv/tsconfig": "^2.2.1",
+    "eslint-config-pluv": "^2.2.1"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/AbstractCrdtDocFactory.ts

@@ -1,20 +1,22 @@
-import type { CrdtDocLike } from "@pluv/types";
-import type { CrdtType } from "./types";
+import type { CrdtDocLike, CrdtType } from "@pluv/types";
 
-export abstract class AbstractCrdtDocFactory<TStorage extends Record<string, CrdtType<any, any>>> {
+export abstract class AbstractCrdtDocFactory<
+    TDoc extends any,
+    TStorage extends Record<string, CrdtType<any, any>>,
+> {
     public _initialStorage: (builder: any) => TStorage;
 
     constructor(initialStorage: (builder: any) => TStorage) {
         this._initialStorage = initialStorage;
     }
 
-    public abstract getEmpty(): CrdtDocLike<TStorage>;
+    public abstract getEmpty(): CrdtDocLike<TDoc, TStorage>;
     public abstract getFactory(
         initialStorage?: (builder: any) => TStorage,
-    ): AbstractCrdtDocFactory<TStorage>;
+    ): AbstractCrdtDocFactory<TDoc, TStorage>;
     public abstract getInitialized(
         initialStorage?: (builder: any) => TStorage,
-    ): CrdtDocLike<TStorage>;
+    ): CrdtDocLike<TDoc, TStorage>;
 
     public resolveEncodedState(updates: string | string[] | readonly string[]): string | null {
         if (typeof updates === "string") return updates;

package/src/NoopCrdtDoc.ts

@@ -5,7 +5,9 @@ import {
     DocSubscribeCallbackParams,
 } from "@pluv/types";
 
-export class NoopCrdtDoc implements CrdtDocLike<any> {
+export class NoopCrdtDoc implements CrdtDocLike<any, any> {
+    public value: any = null;
+
     public applyEncodedState(params: DocApplyEncodedStateParams): this {
         return this;
     }
@@ -48,7 +50,7 @@ export class NoopCrdtDoc implements CrdtDocLike<any> {
         return this;
     }
 
-    public subscribe(listener: (params: DocSubscribeCallbackParams<any>) => void): () => void {
+    public subscribe(listener: (params: DocSubscribeCallbackParams<any, any>) => void): () => void {
         return () => undefined;
     }
 

package/src/NoopCrdtDocFactory.ts

@@ -1,7 +1,7 @@
 import { AbstractCrdtDocFactory } from "./AbstractCrdtDocFactory";
 import { NoopCrdtDoc } from "./NoopCrdtDoc";
 
-export class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any> {
+export class NoopCrdtDocFactory extends AbstractCrdtDocFactory<any, any> {
     constructor(initialStorage: () => {} = () => ({})) {
         super(initialStorage);
     }

package/src/index.ts

@@ -1,17 +1,19 @@
 export type {
     CrdtDocLike,
+    CrdtType,
     DocApplyEncodedStateParams,
     DocBatchApplyEncodedStateParams,
     DocSubscribeCallbackParams,
+    InferCrdtJson,
 } from "@pluv/types";
 export { AbstractCrdtDocFactory } from "./AbstractCrdtDocFactory";
 export { noop } from "./noop";
 export { NoopCrdtDoc } from "./NoopCrdtDoc";
 export { NoopCrdtDocFactory } from "./NoopCrdtDocFactory";
 export type {
-    CrdtType,
     InferBuilder,
-    InferCrdtJson,
+    InferDoc,
+    InferDocLike,
     InferInitialStorageFn,
     InferStorage,
 } from "./types";

package/src/types.ts

@@ -1,33 +1,19 @@
-import type { Json } from "@pluv/types";
-import { AbstractCrdtDocFactory } from "./AbstractCrdtDocFactory";
+import type { AbstractCrdtDocFactory } from "./AbstractCrdtDocFactory";
 
-export type CrdtType<TValue extends unknown, TJson extends unknown = any> = Omit<
-    TValue,
-    "__pluvType"
-> & {
-    __pluvType: () => TJson;
-};
+export type InferDoc<TFactory extends AbstractCrdtDocFactory<any, any>> =
+    InferDocLike<TFactory>["value"];
 
-export type InferCrdtJson<T extends unknown> =
-    T extends CrdtType<any, infer IJson>
-        ? InferCrdtJson<IJson>
-        : T extends Record<string, any>
-          ? { [P in keyof T]: InferCrdtJson<T[P]> }
-          : T extends (infer IJson)[]
-            ? InferCrdtJson<IJson>[]
-            : T extends readonly (infer IJson)[]
-              ? readonly InferCrdtJson<IJson>[]
-              : T extends Json
-                ? T
-                : string;
+export type InferDocLike<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<
+    TFactory["getInitialized"]
+>;
 
-export type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any>> =
+export type InferInitialStorageFn<TFactory extends AbstractCrdtDocFactory<any, any>> =
     TFactory["_initialStorage"];
 
-export type InferStorage<TFactory extends AbstractCrdtDocFactory<any>> = ReturnType<
+export type InferStorage<TFactory extends AbstractCrdtDocFactory<any, any>> = ReturnType<
     InferInitialStorageFn<TFactory>
 >;
 
-export type InferBuilder<TFactory extends AbstractCrdtDocFactory<any>> = Parameters<
+export type InferBuilder<TFactory extends AbstractCrdtDocFactory<any, any>> = Parameters<
     InferInitialStorageFn<TFactory>
 >[0];