@kubun/db-adapter 0.8.1 → 0.10.0

package/lib/postgres.d.ts

@@ -1,4 +1,4 @@
-import type { Kysely } from 'kysely';
+import type { Expression, Kysely, RawBuilder } from 'kysely';
 import type { AbstractAdapter, AdapterTypes, ColumnTypes, Functions, SearchHit, SearchIndexConfig, SearchQuery } from './types.js';
 export type PostgresTypes = {
     Binary: Uint8Array;
@@ -13,6 +13,13 @@ export declare class AbstractPostgresAdapter<T extends AdapterTypes = PostgresTy
     encodeTimestamp(value: Date): string;
     decodeTimestamp(value: string): Date;
     coerceFilterValue(value: unknown): unknown;
+    numericCast(expression: Expression<unknown>): Expression<number>;
+    readAccessPredicate(params: {
+        viewerDID: string;
+        groupIDs: Array<string>;
+        circleIDs: Array<string>;
+        serverDefault: string;
+    }, modelID: string): RawBuilder<boolean>;
     createSearchIndex(db: Kysely<unknown>, config: SearchIndexConfig): Promise<void>;
     dropSearchIndex(db: Kysely<unknown>, modelID: string): Promise<void>;
     updateSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string, fields: Record<string, string>, fieldNames: Array<string>): Promise<void>;

package/lib/postgres.js

@@ -1,19 +1,37 @@
-import{sql as e}from"kysely";export class AbstractPostgresAdapter{functions={now:"now()"};types={binary:"bytea",json:"jsonb",serial:"serial",text:"text",timestamp:"timestamptz(3)",uuid:"uuid"};encodeBinary(e){return e}encodeJSON(e){return e}encodeTimestamp(e){return e.toISOString()}decodeTimestamp(e){return new Date(e)}coerceFilterValue(e){return"boolean"==typeof e?e?"true":"false":e}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,c=`k_${r.modelID}`;await e`
-      CREATE TABLE IF NOT EXISTS ${e.ref(a)} (
-        document_id TEXT PRIMARY KEY REFERENCES ${e.ref(c)}(id) ON DELETE CASCADE,
+import{sql as e}from"kysely";export class AbstractPostgresAdapter{functions={now:"now()"};types={binary:"bytea",json:"jsonb",serial:"serial",text:"text",timestamp:"timestamptz(3)",uuid:"uuid"};encodeBinary(e){return e}encodeJSON(e){return e}encodeTimestamp(e){return e.toISOString()}decodeTimestamp(e){return new Date(e)}coerceFilterValue(e){return"boolean"==typeof e?e?"true":"false":e}numericCast(t){return e`(${t})::numeric`}readAccessPredicate(t,a){let{viewerDID:r,groupIDs:s,circleIDs:n,serverDefault:o}=t,_=[e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(data -> 'accessPermissions' -> 'read' -> 'allowedDIDs', '[]'::jsonb)) AS _t WHERE _t = ${r})`];s.length>0&&_.push(e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(data -> 'accessPermissions' -> 'read' -> 'allowedGroups', '[]'::jsonb)) AS _t WHERE _t IN (${e.join(s.map(t=>e`${t}`))}))`),n.length>0&&_.push(e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(data -> 'accessPermissions' -> 'read' -> 'allowedCircles', '[]'::jsonb)) AS _t WHERE _t IN (${e.join(n.map(t=>e`${t}`))}))`);let d=_.reduce((t,a)=>e`${t} OR ${a}`),E=[e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(_mad.allowed_dids, '[]'::jsonb)) AS _t WHERE _t = ${r})`];s.length>0&&E.push(e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(_mad.allowed_groups, '[]'::jsonb)) AS _t WHERE _t IN (${e.join(s.map(t=>e`${t}`))}))`),n.length>0&&E.push(e`EXISTS (SELECT 1 FROM jsonb_array_elements_text(COALESCE(_mad.allowed_circles, '[]'::jsonb)) AS _t WHERE _t IN (${e.join(n.map(t=>e`${t}`))}))`);let c=E.reduce((t,a)=>e`${t} OR ${a}`),l="anyone"===o?e`true`:"only_owner"===o?e`owner = ${r}`:e`false`;return e`(
+      owner = ${r}
+      OR (data -> 'accessPermissions' -> 'read' ->> 'level') = 'anyone'
+      OR ((data -> 'accessPermissions' -> 'read' ->> 'level') = 'only_owner' AND owner = ${r})
+      OR ((data -> 'accessPermissions' -> 'read' ->> 'level') = 'restricted' AND (${d}))
+      OR ((data -> 'accessPermissions' -> 'read' ->> 'level') IS NULL AND EXISTS (
+        SELECT 1 FROM kubun_graph_user_model_access_defaults AS _mad
+        WHERE _mad.owner_did = owner AND _mad.model_id = ${a} AND _mad.permission_type = 'read'
+        AND (
+          _mad.access_level = 'anyone'
+          OR (_mad.access_level = 'only_owner' AND owner = ${r})
+          OR (_mad.access_level = 'restricted' AND (${c}))
+        )
+      ))
+      OR ((data -> 'accessPermissions' -> 'read' ->> 'level') IS NULL AND NOT EXISTS (
+        SELECT 1 FROM kubun_graph_user_model_access_defaults AS _mad2
+        WHERE _mad2.owner_did = owner AND _mad2.model_id = ${a} AND _mad2.permission_type = 'read'
+      ) AND (${l}))
+    )`}async createSearchIndex(t,a){let r=`fts_${a.modelID}`,s=`k_${a.modelID}`;await e`
+      CREATE TABLE IF NOT EXISTS ${e.ref(r)} (
+        document_id TEXT PRIMARY KEY REFERENCES ${e.ref(s)}(id) ON DELETE CASCADE,
         search_vector tsvector
       )
     `.execute(t),await e`
-      CREATE INDEX IF NOT EXISTS ${e.ref(`ftsi_${r.modelID}`)}
-      ON ${e.ref(a)} USING GIN(search_vector)
-    `.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)} CASCADE`.execute(t)}async updateSearchEntry(t,r,a,c,n){let s=`fts_${r}`,o=n.map(t=>{let r=c[t]??"";return e`to_tsvector('simple', ${r})`}).reduce((t,r)=>e`${t} || ${r}`);await e`
-      INSERT INTO ${e.ref(s)} (document_id, search_vector)
-      VALUES (${a}, ${o})
-      ON CONFLICT (document_id) DO UPDATE SET search_vector = ${o}
-    `.execute(t)}async removeSearchEntry(t,r,a){let c=`fts_${r}`;await e`DELETE FROM ${e.ref(c)} WHERE document_id = ${a}`.execute(t)}async searchIndex(t,r){let a=`fts_${r.modelID}`;return(await e`
-      SELECT document_id, ts_rank(search_vector, plainto_tsquery('simple', ${r.query})) AS rank
-      FROM ${e.ref(a)}
-      WHERE search_vector @@ plainto_tsquery('simple', ${r.query})
+      CREATE INDEX IF NOT EXISTS ${e.ref(`ftsi_${a.modelID}`)}
+      ON ${e.ref(r)} USING GIN(search_vector)
+    `.execute(t)}async dropSearchIndex(t,a){let r=`fts_${a}`;await e`DROP TABLE IF EXISTS ${e.ref(r)} CASCADE`.execute(t)}async updateSearchEntry(t,a,r,s,n){let o=`fts_${a}`,_=n.map(t=>{let a=s[t]??"";return e`to_tsvector('simple', ${a})`}).reduce((t,a)=>e`${t} || ${a}`);await e`
+      INSERT INTO ${e.ref(o)} (document_id, search_vector)
+      VALUES (${r}, ${_})
+      ON CONFLICT (document_id) DO UPDATE SET search_vector = ${_}
+    `.execute(t)}async removeSearchEntry(t,a,r){let s=`fts_${a}`;await e`DELETE FROM ${e.ref(s)} WHERE document_id = ${r}`.execute(t)}async searchIndex(t,a){let r=`fts_${a.modelID}`;return(await e`
+      SELECT document_id, ts_rank(search_vector, plainto_tsquery('simple', ${a.query})) AS rank
+      FROM ${e.ref(r)}
+      WHERE search_vector @@ plainto_tsquery('simple', ${a.query})
       ORDER BY rank DESC
-      LIMIT ${r.limit}
+      LIMIT ${a.limit}
     `.execute(t)).rows.map(e=>({documentID:e.document_id,rank:e.rank}))}}

package/lib/sqlite.d.ts

@@ -1,4 +1,4 @@
-import type { Kysely } from 'kysely';
+import type { Expression, Kysely, RawBuilder } from 'kysely';
 import type { AbstractAdapter, AdapterTypes, ColumnTypes, Functions, SearchHit, SearchIndexConfig, SearchQuery } from './types.js';
 export type SQLiteTypes = {
     Binary: Uint8Array;
@@ -13,6 +13,13 @@ export declare class AbstractSQLiteAdapter<T extends AdapterTypes = SQLiteTypes>
     encodeTimestamp(value: Date): number;
     decodeTimestamp(value: number): Date;
     coerceFilterValue(value: unknown): unknown;
+    numericCast(expression: Expression<unknown>): Expression<number>;
+    readAccessPredicate(params: {
+        viewerDID: string;
+        groupIDs: Array<string>;
+        circleIDs: Array<string>;
+        serverDefault: string;
+    }, modelID: string): RawBuilder<boolean>;
     createSearchIndex(db: Kysely<unknown>, config: SearchIndexConfig): Promise<void>;
     dropSearchIndex(db: Kysely<unknown>, modelID: string): Promise<void>;
     updateSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string, fields: Record<string, string>, fieldNames: Array<string>): Promise<void>;

package/lib/sqlite.js

@@ -1,6 +1,24 @@
-import{sql as e}from"kysely";export class AbstractSQLiteAdapter{functions={now:e`(unixepoch())`};types={binary:"blob",json:"jsonb",serial:"integer",text:"text",timestamp:"integer",uuid:"text"};encodeBinary(e){return e}encodeJSON(e){return JSON.stringify(e)}encodeTimestamp(e){return Math.floor(e.getTime()/1e3)}decodeTimestamp(e){return new Date(1e3*e)}coerceFilterValue(e){return"boolean"==typeof e?+!!e:e}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,n=["document_id UNINDEXED",...r.fields].join(", ");await e`CREATE VIRTUAL TABLE IF NOT EXISTS ${e.ref(a)} USING fts5(${e.raw(n)})`.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)}`.execute(t)}async updateSearchEntry(t,r,a,n,i){let c=`fts_${r}`;await e`DELETE FROM ${e.ref(c)} WHERE document_id = ${a}`.execute(t);let o=["document_id",...i].join(", "),d=[a,...i.map(e=>n[e]??"")].map(t=>e.lit(t));await e`INSERT INTO ${e.ref(c)} (${e.raw(o)}) VALUES (${e.join(d)})`.execute(t)}async removeSearchEntry(t,r,a){let n=`fts_${r}`;await e`DELETE FROM ${e.ref(n)} WHERE document_id = ${a}`.execute(t)}async searchIndex(t,r){let a=`fts_${r.modelID}`;return(await e`
-      SELECT document_id, rank FROM ${e.ref(a)}
-      WHERE ${e.ref(a)} MATCH ${r.query}
+import{sql as e}from"kysely";export class AbstractSQLiteAdapter{functions={now:e`(unixepoch())`};types={binary:"blob",json:"jsonb",serial:"integer",text:"text",timestamp:"integer",uuid:"text"};encodeBinary(e){return e}encodeJSON(e){return JSON.stringify(e)}encodeTimestamp(e){return Math.floor(e.getTime()/1e3)}decodeTimestamp(e){return new Date(1e3*e)}coerceFilterValue(e){return"boolean"==typeof e?+!!e:e}numericCast(a){return e`CAST(${a} AS REAL)`}readAccessPredicate(a,s){let{viewerDID:t,groupIDs:r,circleIDs:n,serverDefault:o}=a,d=[e`EXISTS (SELECT 1 FROM json_each(COALESCE(json_extract(data, '$.accessPermissions.read.allowedDIDs'), '[]')) WHERE value = ${t})`];r.length>0&&d.push(e`EXISTS (SELECT 1 FROM json_each(COALESCE(json_extract(data, '$.accessPermissions.read.allowedGroups'), '[]')) WHERE value IN (${e.join(r.map(a=>e`${a}`))}))`),n.length>0&&d.push(e`EXISTS (SELECT 1 FROM json_each(COALESCE(json_extract(data, '$.accessPermissions.read.allowedCircles'), '[]')) WHERE value IN (${e.join(n.map(a=>e`${a}`))}))`);let c=d.reduce((a,s)=>e`${a} OR ${s}`),E=[e`EXISTS (SELECT 1 FROM json_each(COALESCE(_mad.allowed_dids, '[]')) WHERE value = ${t})`];r.length>0&&E.push(e`EXISTS (SELECT 1 FROM json_each(COALESCE(_mad.allowed_groups, '[]')) WHERE value IN (${e.join(r.map(a=>e`${a}`))}))`),n.length>0&&E.push(e`EXISTS (SELECT 1 FROM json_each(COALESCE(_mad.allowed_circles, '[]')) WHERE value IN (${e.join(n.map(a=>e`${a}`))}))`);let i=E.reduce((a,s)=>e`${a} OR ${s}`),l="anyone"===o?e`1 = 1`:"only_owner"===o?e`owner = ${t}`:e`1 = 0`;return e`(
+      owner = ${t}
+      OR json_extract(data, '$.accessPermissions.read.level') = 'anyone'
+      OR (json_extract(data, '$.accessPermissions.read.level') = 'only_owner' AND owner = ${t})
+      OR (json_extract(data, '$.accessPermissions.read.level') = 'restricted' AND (${c}))
+      OR (json_extract(data, '$.accessPermissions.read.level') IS NULL AND EXISTS (
+        SELECT 1 FROM kubun_graph_user_model_access_defaults AS _mad
+        WHERE _mad.owner_did = owner AND _mad.model_id = ${s} AND _mad.permission_type = 'read'
+        AND (
+          _mad.access_level = 'anyone'
+          OR (_mad.access_level = 'only_owner' AND owner = ${t})
+          OR (_mad.access_level = 'restricted' AND (${i}))
+        )
+      ))
+      OR (json_extract(data, '$.accessPermissions.read.level') IS NULL AND NOT EXISTS (
+        SELECT 1 FROM kubun_graph_user_model_access_defaults AS _mad2
+        WHERE _mad2.owner_did = owner AND _mad2.model_id = ${s} AND _mad2.permission_type = 'read'
+      ) AND (${l}))
+    )`}async createSearchIndex(a,s){let t=`fts_${s.modelID}`,r=["document_id UNINDEXED",...s.fields].join(", ");await e`CREATE VIRTUAL TABLE IF NOT EXISTS ${e.ref(t)} USING fts5(${e.raw(r)})`.execute(a)}async dropSearchIndex(a,s){let t=`fts_${s}`;await e`DROP TABLE IF EXISTS ${e.ref(t)}`.execute(a)}async updateSearchEntry(a,s,t,r,n){let o=`fts_${s}`;await e`DELETE FROM ${e.ref(o)} WHERE document_id = ${t}`.execute(a);let d=["document_id",...n].join(", "),c=[t,...n.map(e=>r[e]??"")].map(a=>e.lit(a));await e`INSERT INTO ${e.ref(o)} (${e.raw(d)}) VALUES (${e.join(c)})`.execute(a)}async removeSearchEntry(a,s,t){let r=`fts_${s}`;await e`DELETE FROM ${e.ref(r)} WHERE document_id = ${t}`.execute(a)}async searchIndex(a,s){let t=`fts_${s.modelID}`;return(await e`
+      SELECT document_id, rank FROM ${e.ref(t)}
+      WHERE ${e.ref(t)} MATCH ${s.query}
       ORDER BY rank
-      LIMIT ${r.limit}
-    `.execute(t)).rows.map(e=>({documentID:e.document_id,rank:e.rank}))}}
+      LIMIT ${s.limit}
+    `.execute(a)).rows.map(e=>({documentID:e.document_id,rank:e.rank}))}}

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { ColumnDataType, ColumnType, Dialect, Kysely, RawBuilder } from 'kysely';
+import type { ColumnDataType, ColumnType, Dialect, Expression, Kysely, RawBuilder } from 'kysely';
 export type CreatedAtColumn = ColumnType<number, number | undefined, never>;
 export type UpdatedAtColumn = ColumnType<number, number | undefined, number | undefined>;
 export type ColumnTypes = {
@@ -43,6 +43,13 @@ export type AbstractAdapter<T extends AdapterTypes = AdapterTypes> = {
     removeSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string): Promise<void>;
     searchIndex(db: Kysely<unknown>, params: SearchQuery): Promise<Array<SearchHit>>;
     coerceFilterValue(value: unknown): unknown;
+    numericCast(expression: Expression<unknown>): Expression<number>;
+    readAccessPredicate(params: {
+        viewerDID: string;
+        groupIDs: Array<string>;
+        circleIDs: Array<string>;
+        serverDefault: string;
+    }, modelID: string): RawBuilder<boolean>;
 };
 export type Adapter<T extends AdapterTypes = AdapterTypes> = AbstractAdapter<T> & {
     dialect: Dialect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/db-adapter",
-  "version": "0.8.1",
+  "version": "0.10.0",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -15,7 +15,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "kysely": "^0.28.16"
+    "kysely": "^0.29.2"
   },
   "scripts": {
     "build:clean": "del lib",