@snowtop/ent 0.1.0-alpha75 → 0.1.0-alpha79

package/action/action.d.ts

@@ -53,7 +53,7 @@ export interface Action<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt
     getObservers?(): Observer<TEnt, TBuilder, TViewer, TInput, TExistingEnt>[];
     getValidators?(): Validator<TEnt, TBuilder, TViewer, TInput, TExistingEnt>[];
     getInput(): TInput;
-    transformWrite?: (stmt: UpdateOperation<TEnt, TViewer>) => Promise<TransformedUpdateOperation<TEnt>> | TransformedUpdateOperation<TEnt> | null;
+    transformWrite?: (stmt: UpdateOperation<TEnt, TViewer>) => Promise<TransformedUpdateOperation<TEnt, TViewer>> | TransformedUpdateOperation<TEnt, TViewer> | null;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     viewerForEntLoad?(data: Data, context?: Context<TViewer>): TViewer | Promise<TViewer>;

package/action/orchestrator.d.ts

@@ -108,6 +108,7 @@ export declare class EntChangeset<T extends Ent> implements Changeset {
     private options?;
     private _executor;
     constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies?: Map<ID, Builder<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>, Ent<Viewer<Ent<any> | null, ID | null>> | null>> | undefined, changesets?: Changeset[] | undefined, options?: OrchestratorOptions<T, Data, Viewer<Ent<any> | null, ID | null>, MaybeNull<T>> | undefined);
+    static changesetFrom(builder: Builder<any, any, any>, ops: DataOperation[]): EntChangeset<any>;
     executor(): Executor;
 }
 export {};

package/action/orchestrator.js

@@ -487,6 +487,10 @@ class Orchestrator {
                     // this.defaultFieldsByFieldName[k] = val;
                 }
             }
+            if (transformed.changeset) {
+                const ct = await transformed.changeset();
+                this.changesets.push(ct);
+            }
             this.actualOperation = this.getWriteOpForSQLStamentOp(transformed.op);
             if (transformed.existingEnt) {
                 // @ts-ignore
@@ -719,6 +723,9 @@ class Orchestrator {
     }
 }
 exports.Orchestrator = Orchestrator;
+function randomNum() {
+    return Math.random().toString(10).substring(2);
+}
 class EntChangeset {
     constructor(viewer, placeholderID, ent, operations, dependencies, changesets, options) {
         this.viewer = viewer;
@@ -729,6 +736,9 @@ class EntChangeset {
         this.changesets = changesets;
         this.options = options;
     }
+    static changesetFrom(builder, ops) {
+        return new EntChangeset(builder.viewer, `$ent.idPlaceholderID$ ${randomNum()}-${builder.ent.name}`, builder.ent, ops);
+    }
     executor() {
         if (this._executor) {
             return this._executor;

package/core/clause.js

@@ -184,9 +184,9 @@ class postgresArrayOperator {
     }
     logValues() {
         if (isSensitive(this.value)) {
-            return [this.value.logValue()];
+            return [`{${this.value.logValue()}}`];
         }
-        return [this.value];
+        return [`{${this.value}}`];
     }
     instanceKey() {
         if (this.not) {
@@ -211,6 +211,18 @@ class postgresArrayOperatorList extends postgresArrayOperator {
                 .join(", ")}}`,
         ];
     }
+    logValues() {
+        return [
+            `{${this.value
+                .map((v) => {
+                if (isSensitive(v)) {
+                    return v.logValue();
+                }
+                return v;
+            })
+                .join(", ")}}`,
+        ];
+    }
 }
 class inClause {
     constructor(col, value, type = "uuid") {

package/core/db.d.ts

@@ -28,7 +28,7 @@ export default class DB {
     getConnection(): Connection;
     getPool(): Queryer;
     getNewClient(): Promise<Client>;
-    getSQLiteClient(): Promise<Sqlite>;
+    getSQLiteClient(): Sqlite;
     endPool(): Promise<void>;
     static getInstance(): DB;
     static getDialect(): Dialect;

package/core/db.js

@@ -148,7 +148,7 @@ class DB {
     async getNewClient() {
         return this.q.newClient();
     }
-    async getSQLiteClient() {
+    getSQLiteClient() {
         if (this.db.dialect == Dialect.Postgres) {
             throw new Error(`can't call getSQLiteClient when dialect is postgres`);
         }

package/core/ent.d.ts

@@ -89,6 +89,12 @@ export interface EditNodeOptions<T extends Ent> extends EditRowOptions {
     placeholderID?: ID;
     key: string;
 }
+export declare class RawQueryOperation implements DataOperation {
+    private queries;
+    constructor(queries: (string | parameterizedQueryOptions)[]);
+    performWrite(queryer: Queryer, context?: Context): Promise<void>;
+    performWriteSync(queryer: SyncQueryer, context?: Context): void;
+}
 export declare class EditNodeOperation<T extends Ent> implements DataOperation {
     options: EditNodeOptions<T>;
     private existingEnt;

package/core/ent.js

@@ -22,8 +22,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = exports.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = void 0;
+exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = exports.EditNodeOperation = exports.RawQueryOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -128,7 +128,7 @@ async function applyPrivacyPolicyForRowAndStoreInCacheX(viewer, options, row, in
         throw ent;
     }
     if (ent === null) {
-        throw new Error(`TODO`);
+        throw new Error(`applyPrivacyPolicyForRowImpl returned null when it shouldn't. ent error`);
     }
     return ent;
 }
@@ -151,6 +151,7 @@ async function loadEntViaKey(viewer, key, options) {
         return null;
     }
     // TODO every row.id needs to be audited...
+    // https://github.com/lolopinto/ent/issues/1064
     const info = entFromCacheMaybe(viewer, row.id, options);
     if (info.ent !== undefined) {
         return info.ent;
@@ -158,7 +159,6 @@ async function loadEntViaKey(viewer, key, options) {
     return applyPrivacyPolicyForRowAndStoreInCache(viewer, options, row, info);
 }
 exports.loadEntViaKey = loadEntViaKey;
-// need a cached error...
 async function loadEntX(viewer, id, options) {
     const info = entFromCacheMaybe(viewer, id, options);
     if (info.error !== undefined) {
@@ -175,8 +175,6 @@ async function loadEntX(viewer, id, options) {
     return applyPrivacyPolicyForRowAndStoreInCacheX(viewer, options, row, info);
 }
 exports.loadEntX = loadEntX;
-// TODO test this and loadEntViaKey
-// replace loadEntViaClause??
 async function loadEntXViaKey(viewer, key, options) {
     const row = await options.loaderFactory
         .createLoader(viewer.context)
@@ -242,6 +240,7 @@ async function loadEnts(viewer, options, ...ids) {
                 });
                 if (ent === null) {
                     // TODO this should return null if not loadable...
+                    // https://github.com/lolopinto/ent/issues/1070
                     continue;
                 }
                 // @ts-ignore
@@ -282,12 +281,11 @@ async function loadEnts(viewer, options, ...ids) {
         }
         if (ent !== undefined) {
             // TODO this should return null if not loadable...?
+            // TODO https://github.com/lolopinto/ent/issues/1070
             m.set(id, ent);
         }
     }
     return m;
-    // TODO do we want to change this to be a map not a list so that it's easy to check for existence?
-    // TODO eventually this should be doing a cache then db queyr and maybe depend on dataloader to get all the results at once
 }
 exports.loadEnts = loadEnts;
 // calls loadEnts and returns the results sorted in the order they were passed in
@@ -324,6 +322,7 @@ async function loadCustomEnts(viewer, options, query) {
     const result = new Array(rows.length);
     await Promise.all(rows.map(async (row, idx) => {
         // TODO what if key is different
+        // TODO https://github.com/lolopinto/ent/issues/1064
         const info = entFromCacheMaybe(viewer, row.id, options);
         if (info.ent !== undefined) {
             if (info.ent === null) {
@@ -533,42 +532,27 @@ async function loadRow(options) {
     }
     const query = buildQuery(options);
     logQuery(query, options.clause.logValues());
-    try {
-        const pool = db_1.default.getInstance().getPool();
-        const res = await pool.query(query, options.clause.values());
-        if (res.rowCount != 1) {
-            if (res.rowCount > 1) {
-                (0, logger_1.log)("error", "got more than one row for query " + query);
-            }
-            return null;
-        }
-        // put the row in the cache...
-        if (cache) {
-            cache.primeCache(options, res.rows[0]);
+    const pool = db_1.default.getInstance().getPool();
+    const res = await pool.query(query, options.clause.values());
+    if (res.rowCount != 1) {
+        if (res.rowCount > 1) {
+            (0, logger_1.log)("error", "got more than one row for query " + query);
         }
-        return res.rows[0];
-    }
-    catch (e) {
-        // an example of an error being suppressed
-        // another one. TODO https://github.com/lolopinto/ent/issues/862
-        (0, logger_1.log)("error", e);
         return null;
     }
+    // put the row in the cache...
+    if (cache) {
+        cache.primeCache(options, res.rows[0]);
+    }
+    return res.rows[0];
 }
 exports.loadRow = loadRow;
 // this always goes to the db, no cache, nothing
 async function performRawQuery(query, values, logValues) {
     const pool = db_1.default.getInstance().getPool();
     logQuery(query, logValues || []);
-    try {
-        const res = await pool.queryAll(query, values);
-        return res.rows;
-    }
-    catch (e) {
-        // TODO need to change every query to catch an error!
-        (0, logger_1.log)("error", e);
-        return [];
-    }
+    const res = await pool.queryAll(query, values);
+    return res.rows;
 }
 exports.performRawQuery = performRawQuery;
 // TODO this should throw, we can't be hiding errors here
@@ -626,6 +610,36 @@ function buildGroupQuery(options) {
     ];
 }
 exports.buildGroupQuery = buildGroupQuery;
+class RawQueryOperation {
+    constructor(queries) {
+        this.queries = queries;
+    }
+    async performWrite(queryer, context) {
+        for (const q of this.queries) {
+            if (typeof q === "string") {
+                logQuery(q, []);
+                await queryer.query(q);
+            }
+            else {
+                logQuery(q.query, q.logValues || []);
+                await queryer.query(q.query, q.values);
+            }
+        }
+    }
+    performWriteSync(queryer, context) {
+        for (const q of this.queries) {
+            if (typeof q === "string") {
+                logQuery(q, []);
+                queryer.execSync(q);
+            }
+            else {
+                logQuery(q.query, q.logValues || []);
+                queryer.execSync(q.query, q.values);
+            }
+        }
+    }
+}
+exports.RawQueryOperation = RawQueryOperation;
 class EditNodeOperation {
     constructor(options, existingEnt = null) {
         this.options = options;
@@ -1094,40 +1108,26 @@ function isSyncQueryer(queryer) {
 async function mutateRow(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
-    try {
-        let res;
-        if (isSyncQueryer(queryer)) {
-            res = queryer.execSync(query, values);
-        }
-        else {
-            res = await queryer.exec(query, values);
-        }
-        if (cache) {
-            cache.clearCache();
-        }
-        return res;
+    let res;
+    if (isSyncQueryer(queryer)) {
+        res = queryer.execSync(query, values);
     }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    else {
+        res = await queryer.exec(query, values);
+    }
+    if (cache) {
+        cache.clearCache();
     }
+    return res;
 }
 function mutateRowSync(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
-    try {
-        const res = queryer.execSync(query, values);
-        if (cache) {
-            cache.clearCache();
-        }
-        return res;
-    }
-    catch (err) {
-        // TODO:::why is this not rethrowing?
-        (0, logger_1.log)("error", err);
-        throw err;
+    const res = queryer.execSync(query, values);
+    if (cache) {
+        cache.clearCache();
     }
+    return res;
 }
 function buildInsertQuery(options, suffix) {
     let fields = [];
@@ -1516,6 +1516,8 @@ async function applyPrivacyPolicyForRowX(viewer, options, row) {
     return await applyPrivacyPolicyForEntX(viewer, ent, row, options);
 }
 // TODO this needs to be changed to use ent cache as needed...
+// most current callsites fine not using it
+// custom_query is one that should be updated
 async function applyPrivacyPolicyForRows(viewer, rows, options) {
     let m = new Map();
     // apply privacy logic

package/core/loaders/object_loader.js

@@ -71,6 +71,9 @@ function createDataLoader(options) {
         const rows = await (0, ent_1.loadRows)(rowOptions);
         for (const row of rows) {
             const id = row[col];
+            if (id === undefined) {
+                throw new Error(`need to query for column ${col} when using an object loader because the query may not be sorted and we need the id to maintain sort order`);
+            }
             const idx = m.get(id);
             if (idx === undefined) {
                 throw new Error(`malformed query. got ${id} back but didn't query for it`);
@@ -195,6 +198,9 @@ class ObjectLoader {
     }
 }
 exports.ObjectLoader = ObjectLoader;
+// NOTE: if not querying for all columns
+// have to query for the id field as one of the fields
+// because it's used to maintain sort order of the queried ids
 class ObjectLoaderFactory {
     constructor(options) {
         this.options = options;

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./core/base";
-export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, setGlobalSchema, } from "./core/ent";
+export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, RawQueryOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, setGlobalSchema, } from "./core/ent";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };

package/index.js

@@ -25,8 +25,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.setGlobalSchema = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
-exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = void 0;
+exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.setGlobalSchema = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.RawQueryOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
+exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = void 0;
 __exportStar(require("./core/base"), exports);
 var ent_1 = require("./core/ent");
 Object.defineProperty(exports, "loadEnt", { enumerable: true, get: function () { return ent_1.loadEnt; } });
@@ -44,6 +44,7 @@ Object.defineProperty(exports, "loadRowX", { enumerable: true, get: function ()
 Object.defineProperty(exports, "loadRow", { enumerable: true, get: function () { return ent_1.loadRow; } });
 Object.defineProperty(exports, "loadRows", { enumerable: true, get: function () { return ent_1.loadRows; } });
 Object.defineProperty(exports, "EditNodeOperation", { enumerable: true, get: function () { return ent_1.EditNodeOperation; } });
+Object.defineProperty(exports, "RawQueryOperation", { enumerable: true, get: function () { return ent_1.RawQueryOperation; } });
 Object.defineProperty(exports, "EdgeOperation", { enumerable: true, get: function () { return ent_1.EdgeOperation; } });
 Object.defineProperty(exports, "DeleteNodeOperation", { enumerable: true, get: function () { return ent_1.DeleteNodeOperation; } });
 Object.defineProperty(exports, "AssocEdge", { enumerable: true, get: function () { return ent_1.AssocEdge; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha75",
+  "version": "0.1.0-alpha79",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/schema.d.ts

@@ -1,5 +1,5 @@
 import { Data, Ent, LoaderInfo, PrivacyPolicy, Viewer } from "../core/base";
-import { Builder } from "../action/action";
+import { Builder, Changeset } from "../action/action";
 import { Clause } from "../core/clause";
 import { AssocEdgeInput } from "../core/ent";
 export declare type FieldMap = {
@@ -79,7 +79,7 @@ export interface Pattern {
     disableMixin?: boolean;
     edges?: Edge[];
     transformRead?: () => Clause;
-    transformWrite?: <T extends Ent>(stmt: UpdateOperation<T>) => TransformedUpdateOperation<T> | null;
+    transformWrite?: <T extends Ent<TViewer>, TViewer extends Viewer = Viewer>(stmt: UpdateOperation<T, TViewer>) => TransformedUpdateOperation<T, TViewer> | null;
     transformsDelete?: boolean;
     transformsInsert?: boolean;
     transformsUpdate?: boolean;
@@ -99,14 +99,15 @@ export interface TransformedEdgeUpdateOperation {
 }
 export interface UpdateOperation<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer> {
     op: SQLStatementOperation;
-    builder: Builder<TEnt, TViewer>;
+    builder: Builder<TEnt, TViewer, any>;
     input: Data;
     data?: Map<string, any>;
 }
-export interface TransformedUpdateOperation<T extends Ent> {
+export interface TransformedUpdateOperation<T extends Ent<TViewer>, TViewer extends Viewer = Viewer> {
     op: SQLStatementOperation;
     data?: Data;
     existingEnt?: T | null;
+    changeset?(): Promise<Changeset> | Changeset;
 }
 export declare enum DBType {
     UUID = "UUID",

package/testutils/db_time_zone.d.ts

@@ -0,0 +1,4 @@
+export declare class DBTimeZone {
+    private static getVal;
+    static getDateOffset(d: Date): Promise<string>;
+}

package/testutils/db_time_zone.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DBTimeZone = void 0;
+const luxon_1 = require("luxon");
+const schema_1 = require("../schema");
+const db_1 = __importDefault(require("../core/db"));
+let dbCurrentZone = undefined;
+class DBTimeZone {
+    static async getVal() {
+        if (dbCurrentZone !== undefined) {
+            return dbCurrentZone;
+        }
+        const r = await db_1.default.getInstance()
+            .getPool()
+            .query("SELECT current_setting('TIMEZONE');");
+        if (r.rows.length) {
+            dbCurrentZone = r.rows[0].current_setting;
+        }
+        else {
+            dbCurrentZone = null;
+        }
+        return dbCurrentZone;
+    }
+    static async getDateOffset(d) {
+        let zone = await DBTimeZone.getVal();
+        let dt = luxon_1.DateTime.fromJSDate(d);
+        if (zone) {
+            dt = dt.setZone(zone);
+        }
+        // use
+        const val = (0, schema_1.leftPad)(dt.get("offset") / 60);
+        if (val == "00") {
+            return "+00";
+        }
+        return val;
+    }
+}
+exports.DBTimeZone = DBTimeZone;

package/testutils/write.js

@@ -1,16 +1,38 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteRowsForTest = exports.editRowForTest = exports.createRowForTest = void 0;
 const ent_1 = require("../core/ent");
-const db_1 = __importDefault(require("../core/db"));
+const db_1 = __importStar(require("../core/db"));
 function isSyncClient(client) {
     return client.execSync !== undefined;
 }
 async function createRowForTest(options, suffix) {
-    const client = await db_1.default.getInstance().getNewClient();
+    let client;
+    if (db_1.Dialect.SQLite === db_1.default.getDialect()) {
+        client = db_1.default.getInstance().getSQLiteClient();
+    }
+    else {
+        client = await db_1.default.getInstance().getNewClient();
+    }
     try {
         if (isSyncClient(client)) {
             return (0, ent_1.createRowSync)(client, options, suffix || "");