@snowtop/ent 0.0.39-alpha4 → 0.0.39-alpha6

package/action/action.d.ts

@@ -51,7 +51,7 @@ export interface Action<T extends Ent> {
     observers?: Observer<T>[];
     validators?: Validator<T>[];
     getInput(): Data;
-    transformWrite?: (stmt: UpdateOperation<T>) => Promise<TransformedUpdateOperation<T>> | TransformedUpdateOperation<T> | undefined;
+    transformWrite?: <T2 extends Ent>(stmt: UpdateOperation<T2>) => Promise<TransformedUpdateOperation<T2>> | TransformedUpdateOperation<T2> | undefined;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     viewerForEntLoad?(data: Data): Viewer | Promise<Viewer>;

package/core/clause.d.ts

@@ -36,6 +36,7 @@ export declare function Less(col: string, value: any): simpleClause;
 export declare function GreaterEq(col: string, value: any): simpleClause;
 export declare function LessEq(col: string, value: any): simpleClause;
 export declare function And(...args: Clause[]): compositeClause;
+export declare function AndOptional(...args: (Clause | undefined)[]): Clause;
 export declare function Or(...args: Clause[]): compositeClause;
 export declare function In(col: string, ...values: any): Clause;
 export declare function sensitiveValue(val: any): SensitiveValue;

package/core/clause.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sensitiveValue = exports.In = exports.Or = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = void 0;
+exports.sensitiveValue = exports.In = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -50,11 +50,10 @@ class simpleClause {
         return `${this.col} ${this.op} ?`;
     }
     sqliteNull() {
-        if (!this.handleSqliteNull) {
+        if (!this.handleSqliteNull || this.value !== null) {
             return;
         }
-        const dialect = db_1.default.getDialect();
-        if (this.value !== null || dialect !== db_1.Dialect.SQLite) {
+        if (db_1.default.getDialect() !== db_1.Dialect.SQLite) {
             return;
         }
         return this.handleSqliteNull;
@@ -236,6 +235,15 @@ function And(...args) {
     return new compositeClause(args, " AND ");
 }
 exports.And = And;
+function AndOptional(...args) {
+    // @ts-ignore
+    let filtered = args.filter((v) => v !== undefined);
+    if (filtered.length === 1) {
+        return filtered[0];
+    }
+    return And(...filtered);
+}
+exports.AndOptional = AndOptional;
 function Or(...args) {
     return new compositeClause(args, " OR ");
 }

package/core/ent.js

@@ -84,54 +84,8 @@ function createDataLoader(options) {
         return result;
     }, loaderOptions);
 }
-// TODO probably delete since we're going to generate it now
-// instead of passing this here.
-// async function doPerformQuery<T extends Ent>(
-//   viewer: Viewer,
-//   id: ID,
-//   options: LoadEntOptions<T>,
-// ): Promise<Data | null> {
-//   let newClause: clause.Clause | undefined = undefined;
-//   if (options.schema) {
-//     const schema = getSchema(options.schema);
-//     if (schema.patterns) {
-//       for (const p of schema.patterns) {
-//         if (p.transformRead) {
-//           newClause = p.transformRead({
-//             op: QueryOperation.Select,
-//             clause: clause.Eq("id", id),
-//           });
-//         }
-//       }
-//     }
-//   }
-//   // we want a loader if possible . we don't want this to slow
-//   // things down...
-//   // id = x and deleted_at == null
-//   if (newClause) {
-//     // loader
-//     //    return loadRow({});
-//     // TODO
-//   }
-//   // we want a deleted_at loader...
-//   return options.loaderFactory.createLoader(viewer.context).load(id);
-// }
 // Ent accessors
 async function loadEnt(viewer, id, options) {
-    let newClause;
-    // if (options.schema) {
-    //   const schema = getSchema(options.schema);
-    //   if (schema.patterns) {
-    //     for (const p of schema.patterns) {
-    //       if (p.transformRead) {
-    //         newClause = p.transformRead({
-    //           op: QueryOperation.Select,
-    //           clause: clause.Eq("id", id),
-    //         });
-    //       }
-    //     }
-    //   }
-    // }
     const row = await options.loaderFactory.createLoader(viewer.context).load(id);
     return await applyPrivacyPolicyForRow(viewer, options, row);
 }
@@ -480,7 +434,7 @@ class EditNodeOperation {
         };
         if (this.existingEnt) {
             if (this.hasData(options.fields)) {
-                // even this with returning * doesn't work if transformed...
+                // even this with returning * may not always work if transformed...
                 // we can have a transformed flag to see if it should be returned?
                 this.row = await editRow(queryer, options, this.existingEnt.id, "RETURNING *");
             }
@@ -493,7 +447,7 @@ class EditNodeOperation {
         }
     }
     reloadRow(queryer, id, options) {
-        // TODO this isn'talways an ObjectLoader. should throw or figure out a way to get query
+        // TODO this isn't always an ObjectLoader. should throw or figure out a way to get query
         // and run this on its own...
         const loader = this.options.loadEntOptions.loaderFactory.createLoader(options.context);
         const opts = loader.getOptions();

package/core/loaders/index_loader.js

@@ -4,6 +4,7 @@ exports.IndexLoaderFactory = void 0;
 const query_loader_1 = require("./query_loader");
 // we're keeping this for legacy reasons so as to not break existing callers
 // and to decouple the change here but all callers can safely be changed here to use QueryLoaderFactory
+// @deprecated use QueryLoaderFactory
 class IndexLoaderFactory {
     constructor(options, col, opts) {
         this.factory = new query_loader_1.QueryLoaderFactory({

package/index.d.ts

@@ -11,6 +11,7 @@ declare const query: {
     Eq: typeof q.Eq;
     NotEq: typeof q.NotEq;
     And: typeof q.And;
+    AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
     In: typeof q.In;
     Greater: typeof q.Greater;

package/index.js

@@ -109,6 +109,7 @@ const query = {
     Eq: q.Eq,
     NotEq: q.NotEq,
     And: q.And,
+    AndOptional: q.AndOptional,
     Or: q.Or,
     In: q.In,
     Greater: q.Greater,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.39-alpha4",
+  "version": "0.0.39-alpha6",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",