@kubun/server 0.3.2 → 0.3.4

package/lib/data/graphql.d.ts

@@ -1,5 +1,5 @@
 import type { KubunDB } from '@kubun/db';
-import type { Context } from '@kubun/graphql';
+import { type Context } from '@kubun/graphql';
 import type { DocumentNode } from '@kubun/protocol';
 import { type ExecutionArgs, type GraphQLSchema, type OperationTypeNode } from 'graphql';
 export type ExecutionContext = {

package/lib/data/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAsB,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAuB,MAAM,gBAAgB,CAAA;AAElE,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,aAAa,EAElB,KAAK,iBAAiB,EAEvB,MAAM,SAAS,CAAA;AAGhB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAChD,CAAA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAsK5D;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,gBAAgB,CAAA;IACzB,MAAM,EAAE,aAAa,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACnC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,GAAG,aAAa,CAiB5E"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/data/graphql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,KAAK,OAAO,EAA+C,MAAM,gBAAgB,CAAA;AAC1F,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACjE,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,aAAa,EAElB,KAAK,iBAAiB,EAEvB,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;CAChD,CAAA;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAkC5D;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,gBAAgB,CAAA;IACzB,MAAM,EAAE,aAAa,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,iBAAiB,CAAA;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACnC,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,GAAG,aAAa,CAiB5E"}

package/lib/data/graphql.js

@@ -1,124 +1,12 @@
-import { defer } from '@enkaku/async';
-import { DocumentID } from '@kubun/id';
+import { createReadContext } from '@kubun/graphql';
 import { Kind, parse } from 'graphql';
 export function createContext(ctx) {
-    function createEventGenerator(filter, transform) {
-        let isDone = false;
-        let pending = null;
-        const queue = [];
-        const stop = ctx.db.events.on('document:saved', (event)=>{
-            if (filter(event)) {
-                const toPush = transform(event);
-                if (pending == null) {
-                    queue.push(toPush);
-                } else {
-                    pending.resolve(toPush);
-                    pending = null;
-                }
-            }
-        });
-        const setDone = ()=>{
-            stop();
-            isDone = true;
-            return Promise.resolve({
-                done: true,
-                value: undefined
-            });
-        };
-        return {
-            [Symbol.asyncIterator] () {
-                return this;
-            },
-            next: ()=>{
-                if (isDone) {
-                    return Promise.resolve({
-                        done: true,
-                        value: undefined
-                    });
-                }
-                const value = queue.shift();
-                if (value != null) {
-                    return Promise.resolve({
-                        value,
-                        done: false
-                    });
-                }
-                pending = defer();
-                return pending.promise.then((value)=>({
-                        value,
-                        done: false
-                    }));
-            },
-            return: setDone,
-            throw: setDone
-        };
-    }
+    const readContext = createReadContext(ctx);
     function getMutationDocument(info) {
         return ctx.mutatedDocuments?.[info.path.key];
     }
     return {
-        getViewer () {
-            return ctx.viewerDID;
-        },
-        async loadDocument (id) {
-            return await ctx.db.getDocument(typeof id === 'string' ? DocumentID.fromString(id) : id);
-        },
-        async resolveConnection (modelIDs, args) {
-            // TODO: access control filtering
-            const { entries, hasMore } = await ctx.db.queryDocuments({
-                ...args,
-                modelIDs
-            });
-            return {
-                edges: entries.map((e)=>({
-                        cursor: e.cursor,
-                        node: e.document
-                    })),
-                pageInfo: {
-                    hasNextPage: args.first ? hasMore : false,
-                    hasPreviousPage: args.first ? false : hasMore,
-                    endCursor: entries.at(-1)?.cursor ?? null,
-                    startCursor: entries.at(0)?.cursor ?? null
-                }
-            };
-        },
-        async resolveList (modelIDs, docIDs) {
-            return await ctx.db.listDocuments({
-                modelIDs,
-                docIDs
-            });
-        },
-        subscribeToDocumentCreated (modelIDs) {
-            return createEventGenerator((event)=>event.type === 'create' && modelIDs.includes(event.document.model), (event)=>event.document);
-        },
-        subscribeToDocumentChanged (id) {
-            return createEventGenerator((event)=>{
-                return event.type === 'update' && event.document.id === id && event.document.data !== null;
-            }, (event)=>event.document);
-        },
-        subscribeToDocumentRemoved () {
-            return createEventGenerator((event)=>event.type === 'update' && event.document.data === null, (event)=>event.document.id);
-        },
-        subscribeToDocumentEdgeAdded (modelIDs, hasRelation) {
-            return createEventGenerator((event)=>{
-                return(// document has data
-                event.document.data !== null && // document model is one of the target models
-                modelIDs.includes(event.document.model) && // relation field targets the expected document
-                hasRelation(event.document.data) && // new document or new relation to document
-                (event.type === 'create' || event.previous.data !== null && hasRelation(event.previous.data)));
-            }, (event)=>({
-                    cursor: event.getCursor(),
-                    node: event.document
-                }));
-        },
-        subscribeToDocumentEdgeRemoved (modelIDs, hasRelation) {
-            return createEventGenerator((event)=>{
-                return event.type === 'update' && // document model is one of the target models
-                modelIDs.includes(event.document.model) && // relation existed in previous version
-                event.previous.data !== null && hasRelation(event.previous.data) && // relation is removed
-                (event.document.data === null || !hasRelation(event.document.data));
-            }, (event)=>event.document.id);
-        },
+        ...readContext,
         async executeCreateMutation (modelID, data, info) {
             return getMutationDocument(info);
         },

package/lib/data/mutations.d.ts

@@ -1,13 +1,4 @@
-import { type Validator } from '@enkaku/schema';
-import type { KubunDB } from '@kubun/db';
-import { type DocumentData, type DocumentNode } from '@kubun/protocol';
-type DocumentValidator = Validator<DocumentData>;
-type ValidatorsRecord = Record<string, Promise<DocumentValidator>>;
-export type MutationContext = {
-    db: KubunDB;
-    validators: ValidatorsRecord;
-};
-export declare function getDocumentValidator(ctx: MutationContext, id: string): Promise<DocumentValidator>;
+import { type MutationContext } from '@kubun/mutation';
+import { type DocumentNode } from '@kubun/protocol';
 export declare function applyMutation(ctx: MutationContext, token: string): Promise<DocumentNode>;
-export {};
 //# sourceMappingURL=mutations.d.ts.map

package/lib/data/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../src/data/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,gBAAgB,CAAA;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EACL,KAAK,YAAY,EAEjB,KAAK,YAAY,EAElB,MAAM,iBAAiB,CAAA;AAMxB,KAAK,iBAAiB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;AAChD,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAElE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,OAAO,CAAA;IACX,UAAU,EAAE,gBAAgB,CAAA;CAC7B,CAAA;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOjG;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAiF9F"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../../src/data/mutations.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAA0B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAyB,KAAK,YAAY,EAAoB,MAAM,iBAAiB,CAAA;AAI5F,wBAAsB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAI9F"}

package/lib/data/mutations.js

@@ -1,105 +1,10 @@
-// @ts-ignore missing type definition
-import * as A from '@automerge/automerge/slim';
-import { fromB64 } from '@enkaku/codec';
 import { asType, createValidator } from '@enkaku/schema';
 import { verifyToken } from '@enkaku/token';
-import { DocumentID } from '@kubun/id';
+import { applyMutation as apply } from '@kubun/mutation';
 import { documentMutation } from '@kubun/protocol';
-import { automergeReady, automergeToData } from './automerge.js';
 const validateMutation = createValidator(documentMutation);
-export function getDocumentValidator(ctx, id) {
-    if (ctx.validators[id] == null) {
-        ctx.validators[id] = ctx.db.getDocumentModel(id).then((model)=>createValidator({
-                ...model.schema,
-                $id: id
-            }));
-    }
-    return ctx.validators[id];
-}
 export async function applyMutation(ctx, token) {
-    const [verified] = await Promise.all([
-        verifyToken(token),
-        automergeReady
-    ]);
+    const verified = await verifyToken(token);
     const mutation = asType(validateMutation, verified.payload);
-    switch(mutation.typ){
-        case 'change':
-            {
-                const id = DocumentID.fromString(mutation.sub);
-                const docID = id.toString();
-                const doc = await ctx.db.getDocument(id);
-                if (doc == null) {
-                    throw new Error(`Document not found: ${docID}`);
-                }
-                if (mutation.iss !== doc.owner) {
-                    // TODO: verify capabilities if issuer is not owner
-                    throw new Error('Invalid mutation issuer');
-                }
-                if (mutation.data === null) {
-                    return await ctx.db.saveDocument({
-                        id,
-                        existing: doc,
-                        data: null,
-                        state: null
-                    });
-                }
-                if (doc.data === null) {
-                    throw new Error(`Cannot apply changes to empty document: ${docID}`);
-                }
-                const [docStates, validator] = await Promise.all([
-                    ctx.db.getDocumentStates([
-                        docID
-                    ]),
-                    getDocumentValidator(ctx, id.model.toString())
-                ]);
-                // Create doc from data object if state is not present
-                const currentDoc = docStates[docID] ? A.load(docStates[docID]) : A.from(doc.data);
-                const changes = fromB64(mutation.data);
-                // Apply incremental changes or full merge
-                const newDoc = mutation.inc ? A.loadIncremental(currentDoc, changes) : A.merge(currentDoc, A.load(changes));
-                // Validate merged data
-                const data = asType(validator, automergeToData(newDoc));
-                return await ctx.db.saveDocument({
-                    id,
-                    existing: doc,
-                    data,
-                    state: A.save(newDoc)
-                });
-            }
-        case 'set':
-            {
-                const owner = mutation.aud ?? mutation.iss;
-                if (mutation.iss !== owner) {
-                    // TODO: verify capabilities if issuer is not owner
-                    throw new Error('Invalid mutation issuer');
-                }
-                const id = DocumentID.fromString(mutation.sub);
-                const [doc, validator] = await Promise.all([
-                    ctx.db.getDocument(id),
-                    getDocumentValidator(ctx, id.model.toString())
-                ]);
-                const mergeDoc = mutation.data === null ? null : A.load(fromB64(mutation.data));
-                const data = mergeDoc ? asType(validator, automergeToData(mergeDoc)) : null;
-                if (doc === null) {
-                    return await ctx.db.createDocument({
-                        id,
-                        owner,
-                        data,
-                        state: mergeDoc ? A.save(mergeDoc) : null,
-                        unique: fromB64(mutation.unq)
-                    });
-                }
-                if (doc.owner !== owner) {
-                    throw new Error(`Cannot change owner from ${doc.owner} to ${owner} in document: ${id.toString()}`);
-                }
-                return await ctx.db.saveDocument({
-                    id,
-                    existing: doc,
-                    data,
-                    state: mergeDoc ? A.save(mergeDoc) : null
-                });
-            }
-        default:
-            throw new Error('Unsupported mutation type');
-    }
+    return await apply(ctx, mutation);
 }

package/lib/handlers/document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/handlers/document.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAIvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,CA+BrC"}
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/handlers/document.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAEvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAA;CACZ,CAAA;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,oBAAoB,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,CA8BrC"}

package/lib/handlers/document.js

@@ -1,11 +1,9 @@
-// import * as A from '@automerge/automerge/slim'
 import { toB64 } from '@enkaku/codec';
 export function createHandlers(handlersParams) {
     const { db } = handlersParams;
     return {
         'document/sync': async (ctx)=>{
             const ids = Object.keys(ctx.param.documents);
-            // const [loadedStates] = await Promise.all([db.getDocumentStates(ids), automergeReady])
             const loadedStates = await db.getDocumentStates(ids);
             const states = ids.reduce((acc, id)=>{
                 const loaded = loadedStates[id];

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+export { type ExecutionContext, createContext } from './data/graphql.js';
 export { type CreateHandlersParams, createHandlers } from './handlers/index.js';
 export { type CreateClientParams, KubunServer, type ServerParams } from './server.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,KAAK,kBAAkB,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,KAAK,oBAAoB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,KAAK,kBAAkB,EAAE,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAA"}

package/lib/index.js

@@ -1,2 +1,3 @@
+export { createContext } from './data/graphql.js';
 export { createHandlers } from './handlers/index.js';
 export { KubunServer } from './server.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/server",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -15,7 +15,6 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@automerge/automerge": "^2.2.8",
     "@enkaku/async": "^0.12.0",
     "@enkaku/codec": "^0.12.0",
     "@enkaku/generator": "^0.12.0",
@@ -24,18 +23,18 @@
     "@enkaku/token": "^0.12.0",
     "@enkaku/transport": "^0.12.0",
     "graphql": "^16.11.0",
-    "@kubun/client": "^0.3.2",
-    "@kubun/db": "^0.3.2",
+    "@kubun/client": "^0.3.3",
+    "@kubun/graphql": "^0.3.6",
+    "@kubun/db": "^0.3.3",
     "@kubun/id": "^0.3.0",
     "@kubun/protocol": "^0.3.4",
-    "@kubun/graphql": "^0.3.5"
+    "@kubun/mutation": "^0.3.0"
   },
   "devDependencies": {
     "@databases/pg-test": "^3.1.2",
     "@enkaku/stream": "^0.12.0",
-    "graphql-relay": "^0.10.2",
-    "@kubun/db-sqlite": "^0.3.2",
-    "@kubun/db-postgres": "^0.3.2"
+    "@kubun/db-postgres": "^0.3.2",
+    "@kubun/db-sqlite": "^0.3.2"
   },
   "scripts": {
     "build:clean": "del lib",

package/lib/data/automerge.d.ts

@@ -1,5 +0,0 @@
-import * as A from '@automerge/automerge/slim';
-import type { DocumentData } from '@kubun/protocol';
-export declare const automergeReady: PromiseLike<void>;
-export declare function automergeToData(doc: A.Doc<DocumentData>): DocumentData;
-//# sourceMappingURL=automerge.d.ts.map

package/lib/data/automerge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"automerge.d.ts","sourceRoot":"","sources":["../../src/data/automerge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,2BAA2B,CAAA;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAEnD,eAAO,MAAM,cAAc,mBAA0D,CAAA;AAErF,wBAAgB,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,YAAY,CAEtE"}

package/lib/data/automerge.js

@@ -1,8 +0,0 @@
-// @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';
-export const automergeReady = lazy(()=>A.initializeBase64Wasm(automergeWasmBase64));
-export function automergeToData(doc) {
-    return JSON.parse(JSON.stringify(doc));
-}