@kubun/client 0.3.2 → 0.3.4

package/lib/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../src/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAqD,MAAM,gBAAgB,CAAA;AAEhG,OAAO,KAAK,EAAgB,oBAAoB,EAAgB,MAAM,iBAAiB,CAAA;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAsB,aAAa,EAAE,MAAM,SAAS,CAAA;AAK/F,qBAAa,qBAAsB,SAAQ,KAAK;;gBAGlC,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,OAAO,SAA6B;IAMrF,IAAI,MAAM,IAAI,aAAa,CAAC,YAAY,CAAC,CAExC;CACF;AAID,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAwD/D;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;AAE3E,KAAK,oBAAoB,GAAG;IAC1B,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,gBAAgB,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACpC,CAAA;AAED,qBAAa,eAAe;;gBAGd,MAAM,GAAE,oBAAyB;IAI7C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI9B,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,GACpE,IAAI;IAID,OAAO,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;CAavE"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../src/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAwD,MAAM,gBAAgB,CAAA;AAEnG,OAAO,KAAK,EAAgB,oBAAoB,EAAgB,MAAM,iBAAiB,CAAA;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAsB,aAAa,EAAE,MAAM,SAAS,CAAA;AAK/F,qBAAa,qBAAsB,SAAQ,KAAK;;gBAGlC,MAAM,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,OAAO,SAA6B;IAMrF,IAAI,MAAM,IAAI,aAAa,CAAC,YAAY,CAAC,CAExC;CACF;AAID,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;IACrD,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAwD/D;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA;AAE3E,KAAK,oBAAoB,GAAG;IAC1B,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,OAAO,EAAE,gBAAgB,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACpC,CAAA;AAED,qBAAa,eAAe;;gBAGd,MAAM,GAAE,oBAAyB;IAI7C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAI9B,SAAS,CACP,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,GACpE,IAAI;IAID,OAAO,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;CAavE"}

package/lib/graphql.js

@@ -1,7 +1,7 @@
 import { stringifyToken } from '@enkaku/token';
 import { createSchema } from '@kubun/graphql';
 import { graphql } from 'graphql';
-import { createChangeMutation, createRemoveMutation, createSetMutation } from './mutations.js';
+import { signChangeMutation, signRemoveMutation, signSetMutation } from './mutations.js';
 export class GraphQLExecutionError extends Error {
     #errors;
     constructor(errors, message = 'GraphQL execution failed'){
@@ -19,7 +19,7 @@ export function createContext(client) {
         async executeCreateMutation (modelID, data, info) {
             // Create the mutation token
             const unique = globalThis.crypto.getRandomValues(new Uint8Array(12));
-            const mutation = await createSetMutation({
+            const mutation = await signSetMutation({
                 signer: client.signer,
                 modelID,
                 data,
@@ -32,7 +32,7 @@ export function createContext(client) {
         },
         async executeSetMutation (modelID, unique, data, info) {
             // Create the mutation
-            const mutation = await createSetMutation({
+            const mutation = await signSetMutation({
                 signer: client.signer,
                 modelID,
                 data,
@@ -44,7 +44,7 @@ export function createContext(client) {
             return noDocument;
         },
         async executeUpdateMutation (input, info) {
-            const mutation = await createChangeMutation({
+            const mutation = await signChangeMutation({
                 loadState: client.loadState,
                 signer: client.signer,
                 docID: input.id,
@@ -65,7 +65,7 @@ export function createContext(client) {
             return noDocument;
         },
         async executeRemoveMutation (id, info) {
-            const mutation = await createRemoveMutation({
+            const mutation = await signRemoveMutation({
                 docID: id,
                 signer: client.signer
             });

package/lib/mutations.d.ts

@@ -1,26 +1,16 @@
 import type { SignedToken, TokenSigner } from '@enkaku/token';
-import type { PatchOperation } from '@kubun/graphql';
-import { DocumentID, type DocumentModelID } from '@kubun/id';
+import type { CreateChangeMutationParams, CreateRemoveMutationParams, CreateSetMutationParams } from '@kubun/mutation';
 import type { ChangeDocumentMutation, DocumentData, SetDocumentMutation } from '@kubun/protocol';
-export type SetMutationParams<Data extends DocumentData = DocumentData> = {
-    data: Data | null;
-    modelID: DocumentModelID | string;
-    owner?: string;
+export type SetMutationParams<Data extends DocumentData = DocumentData> = Omit<CreateSetMutationParams<Data>, 'issuer'> & {
     signer: TokenSigner;
-    unique: Uint8Array;
 };
-export declare function createSetMutation<Data extends DocumentData = DocumentData>(params: SetMutationParams<Data>): Promise<SignedToken<SetDocumentMutation>>;
-export type CreateChangeMutationParams<Data extends DocumentData = DocumentData> = {
-    docID: DocumentID | string;
-    from?: Partial<Data>;
-    loadState: (id: string) => Promise<Uint8Array | null>;
-    patch: Array<PatchOperation>;
+export declare function signSetMutation<Data extends DocumentData = DocumentData>(params: SetMutationParams<Data>): Promise<SignedToken<SetDocumentMutation>>;
+export type ChangeMutationParams<Data extends DocumentData = DocumentData> = Omit<CreateChangeMutationParams<Data>, 'issuer'> & {
     signer: TokenSigner;
 };
-export declare function createChangeMutation<Data extends DocumentData = DocumentData>(params: CreateChangeMutationParams<Data>): Promise<SignedToken<ChangeDocumentMutation>>;
-export type RemoveMutationParams = {
-    docID: string;
+export declare function signChangeMutation<Data extends DocumentData = DocumentData>(params: ChangeMutationParams<Data>): Promise<SignedToken<ChangeDocumentMutation>>;
+export type RemoveMutationParams = Omit<CreateRemoveMutationParams, 'issuer'> & {
     signer: TokenSigner;
 };
-export declare function createRemoveMutation(params: RemoveMutationParams): Promise<SignedToken<ChangeDocumentMutation>>;
+export declare function signRemoveMutation(params: RemoveMutationParams): Promise<SignedToken<ChangeDocumentMutation>>;
 //# sourceMappingURL=mutations.d.ts.map

package/lib/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAiFhG,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,IAAI;IACxE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;IACjB,OAAO,EAAE,eAAe,GAAG,MAAM,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,WAAW,CAAA;IACnB,MAAM,EAAE,UAAU,CAAA;CACnB,CAAA;AAED,wBAAsB,iBAAiB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,EAC9E,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAC9B,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAa3C;AAED,MAAM,MAAM,0BAA0B,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,IAAI;IACjF,KAAK,EAAE,UAAU,GAAG,MAAM,CAAA;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACpB,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;IACrD,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,CAAA;IAC5B,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,oBAAoB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,EACjF,MAAM,EAAE,0BAA0B,CAAC,IAAI,CAAC,GACvC,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAkB9C;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAQ9C"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,KAAK,EACV,0BAA0B,EAC1B,0BAA0B,EAC1B,uBAAuB,EACxB,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,sBAAsB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAEhG,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,IAAI,IAAI,CAC5E,uBAAuB,CAAC,IAAI,CAAC,EAC7B,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,eAAe,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,EAC5E,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,GAC9B,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAI3C;AAED,MAAM,MAAM,oBAAoB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,IAAI,IAAI,CAC/E,0BAA0B,CAAC,IAAI,CAAC,EAChC,QAAQ,CACT,GAAG;IACF,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,kBAAkB,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,EAC/E,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAI9C;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,0BAA0B,EAAE,QAAQ,CAAC,GAAG;IAC9E,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAI9C"}

package/lib/mutations.js

@@ -1,122 +1,25 @@
-// @ts-ignore missing type definition
-import { automergeWasmBase64 } from '@automerge/automerge/automerge.wasm.base64.js';
-import * as A from '@automerge/automerge/slim';
-import { lazy } from '@enkaku/async';
-import { toB64 } from '@enkaku/codec';
-import { DocumentID } from '@kubun/id';
-const automergeReady = lazy(()=>A.initializeBase64Wasm(automergeWasmBase64));
-function parsePath(path) {
-    return path.slice(1).split('/').map((key)=>{
-        // Convert array indices to numbers
-        const index = Number(key);
-        return Number.isNaN(index) ? key : index;
+import { createChangeMutation, createRemoveMutation, createSetMutation } from '@kubun/mutation';
+export async function signSetMutation(params) {
+    const { signer, ...rest } = params;
+    const mutation = await createSetMutation({
+        ...rest,
+        issuer: signer.id
     });
+    return await signer.createToken(mutation);
 }
-function getPath(obj, path) {
-    const keys = parsePath(path);
-    // @ts-ignore index signature
-    return keys.reduce((acc, key)=>acc?.[key], obj);
-}
-function setPath(obj, path, value) {
-    const keys = parsePath(path);
-    const lastKey = keys.pop();
-    if (lastKey !== undefined) {
-        // @ts-ignore unknown object
-        const target = keys.reduce((acc, key)=>acc[key], obj);
-        if (Array.isArray(target) && typeof lastKey === 'number' && lastKey === target.length) {
-            target.push(value) // Append to array if index is equal to array length
-            ;
-        } else {
-            ;
-            target[lastKey] = value;
-        }
-    }
-}
-function deletePath(obj, path) {
-    const keys = parsePath(path);
-    const lastKey = keys.pop();
-    if (lastKey !== undefined) {
-        // @ts-ignore unknown object
-        const target = keys.reduce((acc, key)=>acc[key], obj);
-        if (Array.isArray(target) && typeof lastKey === 'number') {
-            target.splice(lastKey, 1) // Remove from array if lastKey is an index
-            ;
-        } else {
-            delete target[lastKey];
-        }
-    }
-}
-function applyPatches(data, patches) {
-    for (const patch of patches){
-        switch(patch.op){
-            case 'add':
-            case 'replace':
-                setPath(data, patch.path, patch.value);
-                break;
-            case 'remove':
-                deletePath(data, patch.path);
-                break;
-            case 'copy':
-                {
-                    const value = getPath(data, patch.from);
-                    setPath(data, patch.path, value);
-                    break;
-                }
-            case 'move':
-                {
-                    const value = getPath(data, patch.from);
-                    deletePath(data, patch.from);
-                    setPath(data, patch.path, value);
-                    break;
-                }
-            default:
-                // @ts-ignore never type
-                throw new Error(`Unknown operation: ${patch.op}`);
-        }
-    }
-}
-export async function createSetMutation(params) {
-    const issuer = params.signer.id;
-    const owner = params.owner ?? issuer;
-    await automergeReady;
-    const docID = await DocumentID.create(params.modelID, owner, params.unique);
-    return await params.signer.createToken({
-        typ: 'set',
-        iss: issuer,
-        aud: owner,
-        sub: docID.toString(),
-        data: params.data == null ? null : toB64(A.save(A.from(params.data))),
-        unq: toB64(params.unique)
-    });
-}
-export async function createChangeMutation(params) {
-    const docID = DocumentID.from(params.docID).toString();
-    // Load current state of document from DB
-    const [state] = await Promise.all([
-        params.loadState(docID),
-        automergeReady
-    ]);
-    const loadedDoc = state ? A.load(state) : null;
-    // Apply patches to loaded doc or locally created one
-    const newDoc = A.change(loadedDoc ?? A.from(params.from ?? {}), (proxy)=>{
-        applyPatches(proxy, params.patch);
-    });
-    // Save incremental or full data state
-    const data = loadedDoc ? A.saveSince(newDoc, A.getHeads(loadedDoc)) : A.save(newDoc);
-    return await params.signer.createToken({
-        typ: 'change',
-        iss: params.signer.id,
-        sub: docID,
-        data: toB64(data),
-        inc: loadedDoc != null
+export async function signChangeMutation(params) {
+    const { signer, ...rest } = params;
+    const mutation = await createChangeMutation({
+        ...rest,
+        issuer: signer.id
     });
+    return await signer.createToken(mutation);
 }
-export async function createRemoveMutation(params) {
-    return await params.signer.createToken({
-        typ: 'change',
-        iss: params.signer.id,
-        sub: params.docID,
-        data: null,
-        inc: false
+export async function signRemoveMutation(params) {
+    const { signer, ...rest } = params;
+    const mutation = createRemoveMutation({
+        ...rest,
+        issuer: signer.id
     });
+    return await signer.createToken(mutation);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/client",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -15,18 +15,17 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@automerge/automerge": "^2.2.8",
-    "@enkaku/async": "^0.12.0",
     "@enkaku/client": "^0.12.0",
     "@enkaku/codec": "^0.12.0",
     "@enkaku/token": "^0.12.0",
     "graphql": "^16.11.0",
-    "multiformats": "^13.3.2",
-    "@kubun/graphql": "^0.3.5",
-    "@kubun/id": "^0.3.0"
+    "multiformats": "^13.3.6",
+    "@kubun/id": "^0.3.0",
+    "@kubun/mutation": "^0.3.1"
   },
   "devDependencies": {
-    "@kubun/protocol": "^0.3.4"
+    "@kubun/protocol": "^0.3.4",
+    "@kubun/graphql": "^0.3.8"
   },
   "scripts": {
     "build:clean": "del lib",