@snowtop/ent 0.1.0-alpha159 → 0.1.0-alpha160-test1

package/action/orchestrator.js

@@ -36,7 +36,7 @@ const executor_1 = require("./executor");
 const logger_1 = require("../core/logger");
 const memoizee_1 = __importDefault(require("memoizee"));
 const clause = __importStar(require("../core/clause"));
-const util_1 = require("util");
+const types_1 = require("util/types");
 const operations_2 = require("./operations");
 var edgeDirection;
 (function (edgeDirection) {
@@ -341,7 +341,7 @@ class Orchestrator {
             }
             if (field.valid) {
                 let valid = field.valid(val);
-                if (util_1.types.isPromise(valid)) {
+                if ((0, types_1.isPromise)(valid)) {
                     valid = await valid;
                 }
                 // if not valid, don't format and don't pass to ent?
@@ -353,7 +353,7 @@ class Orchestrator {
             }
             // nested so it's not JSON stringified or anything like that
             val = field.format(formatted[dbKey], true);
-            if (util_1.types.isPromise(val)) {
+            if ((0, types_1.isPromise)(val)) {
                 val = await val;
             }
             formatted[dbKey] = val;
@@ -673,7 +673,7 @@ class Orchestrator {
                         if (defaultValue === undefined) {
                             throw new Error(`defaultValueOnCreate() returned undefined for field ${fieldName}`);
                         }
-                        if (util_1.types.isPromise(defaultValue)) {
+                        if ((0, types_1.isPromise)(defaultValue)) {
                             defaultValue = await defaultValue;
                         }
                     }
@@ -681,7 +681,7 @@ class Orchestrator {
                 if (field.defaultValueOnEdit &&
                     this.actualOperation === action_1.WriteOperation.Edit) {
                     defaultValue = field.defaultValueOnEdit(builder, input);
-                    if (util_1.types.isPromise(defaultValue)) {
+                    if ((0, types_1.isPromise)(defaultValue)) {
                         defaultValue = await defaultValue;
                     }
                 }
@@ -741,7 +741,7 @@ class Orchestrator {
         else if (this.isBuilder(value)) {
             if (field.valid) {
                 let valid = field.valid(value);
-                if (util_1.types.isPromise(valid)) {
+                if ((0, types_1.isPromise)(valid)) {
                     valid = await valid;
                 }
                 if (!valid) {
@@ -756,7 +756,7 @@ class Orchestrator {
         else {
             if (field.valid) {
                 let valid = field.valid(value);
-                if (util_1.types.isPromise(valid)) {
+                if ((0, types_1.isPromise)(valid)) {
                     valid = await valid;
                 }
                 if (!valid) {

package/core/db.js

@@ -139,7 +139,9 @@ class DB {
         }
         else {
             let sqlite = require("better-sqlite3");
-            this.q = new Sqlite(sqlite(db.filePath || ""));
+            const dbb = sqlite(db.filePath || "");
+            dbb.pragma("journal_mode = WAL");
+            this.q = new Sqlite(dbb);
         }
     }
     getConnection() {

package/core/ent.d.ts

@@ -1,8 +1,38 @@
 import { Queryer, SyncQueryer } from "./db";
-import { Viewer, Ent, ID, LoadRowsOptions, LoadRowOptions, Data, DataOptions, QueryableDataOptions, EditRowOptions, LoadEntOptions, LoadCustomEntOptions, EdgeQueryableDataOptions, Context, CreateRowOptions, QueryDataOptions, SelectCustomDataOptions } from "./base";
+import { Viewer, Ent, ID, LoadRowsOptions, LoadRowOptions, Data, DataOptions, QueryableDataOptions, EditRowOptions, LoadEntOptions, LoadCustomEntOptions, EdgeQueryableDataOptions, Context, CreateRowOptions, QueryDataOptions, SelectCustomDataOptions, LoaderWithLoadMany } from "./base";
 import * as clause from "./clause";
 import DataLoader from "dataloader";
 import { OrderBy } from "./query_impl";
+declare class entCacheMap<TViewer extends Viewer, TEnt extends Ent<TViewer>> {
+    private viewer;
+    private options;
+    private m;
+    private logEnabled;
+    constructor(viewer: TViewer, options: LoadEntOptions<TEnt, TViewer>);
+    get(id: ID): any;
+    set(key: string, value: any): Map<any, any>;
+    delete(key: string): boolean;
+    clear(): void;
+}
+declare class ErrorWrapper {
+    error: Error;
+    constructor(error: Error);
+}
+export declare function rowIsError(row: any): row is Error;
+declare class EntLoader<TViewer extends Viewer, TEnt extends Ent<TViewer>> implements LoaderWithLoadMany<ID, TEnt | ErrorWrapper | Error> {
+    private viewer;
+    private options;
+    private loader;
+    private map;
+    constructor(viewer: TViewer, options: LoadEntOptions<TEnt, TViewer>);
+    getMap(): entCacheMap<TViewer, TEnt>;
+    load(id: ID): Promise<TEnt | ErrorWrapper>;
+    loadMany(ids: ID[]): Promise<Array<TEnt | ErrorWrapper | Error>>;
+    prime(id: ID, ent: TEnt | ErrorWrapper): void;
+    clear(id: ID): void;
+    clearAll(): void;
+}
+export declare function getEntLoader<TViewer extends Viewer, TEnt extends Ent<TViewer>>(viewer: TViewer, options: LoadEntOptions<TEnt, TViewer>): EntLoader<TViewer, TEnt>;
 export declare function getEntKey<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, id: ID, options: LoadEntOptions<TEnt, TViewer>): string;
 export declare function loadEnt<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, id: ID, options: LoadEntOptions<TEnt, TViewer>): Promise<TEnt | null>;
 export declare function loadEntViaKey<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, key: any, options: LoadEntOptions<TEnt, TViewer>): Promise<TEnt | null>;

package/core/ent.js

@@ -26,7 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.getDefaultLimit = exports.setDefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = 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.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.getDefaultLimit = exports.setDefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = exports.getEntLoader = exports.rowIsError = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -102,6 +103,13 @@ class ErrorWrapper {
         this.error = error;
     }
 }
+// note if storing the result of this in something that checks instanceof Error e.g. DataLoader, we need to check instanceof at that callsite
+function rowIsError(row) {
+    // jest does things that break instanceof checks
+    // so we need to check the name as well for native error SqliteError
+    return row instanceof Error || row?.constructor?.name === "SqliteError";
+}
+exports.rowIsError = rowIsError;
 function createEntLoader(viewer, options, map) {
     // share the cache across loaders even if we create a new instance
     const loaderOptions = {};
@@ -119,8 +127,14 @@ function createEntLoader(viewer, options, map) {
         for (let idx = 0; idx < rows.length; idx++) {
             const row = rows[idx];
             // db error
-            if (row instanceof Error) {
-                result[idx] = row;
+            if (rowIsError(row)) {
+                if (row instanceof Error) {
+                    result[idx] = row;
+                }
+                else {
+                    // @ts-ignore SqliteError
+                    result[idx] = new Error(row.message);
+                }
                 continue;
             }
             else if (!row) {
@@ -133,7 +147,7 @@ function createEntLoader(viewer, options, map) {
             }
             else {
                 const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
-                if (r instanceof Error) {
+                if (rowIsError(r)) {
                     result[idx] = new ErrorWrapper(r);
                 }
                 else {
@@ -177,6 +191,7 @@ function getEntLoader(viewer, options) {
     const name = `ent-loader:${viewer.instanceKey()}:${options.loaderFactory.name}`;
     return viewer.context.cache.getLoaderWithLoadMany(name, () => new EntLoader(viewer, options));
 }
+exports.getEntLoader = getEntLoader;
 function getEntKey(viewer, id, options) {
     return `${viewer.instanceKey()}:${options.loaderFactory.name}:${id}`;
 }
@@ -207,7 +222,7 @@ loader) {
         return result;
     }
     const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
-    if (r instanceof Error) {
+    if (rowIsError(r)) {
         loader.prime(id, new ErrorWrapper(r));
         return new ErrorWrapper(r);
     }
@@ -297,7 +312,7 @@ async function loadEnts(viewer, options, ...ids) {
     let m = new Map();
     const ret = await getEntLoader(viewer, options).loadMany(ids);
     for (const r of ret) {
-        if (r instanceof Error) {
+        if (rowIsError(r)) {
             throw r;
         }
         if (r instanceof ErrorWrapper) {
@@ -450,7 +465,7 @@ async function loadDerivedEnt(viewer, data, loader) {
     const r = await applyPrivacyPolicyForEnt(viewer, ent, data, {
         ent: loader,
     });
-    if (r instanceof Error) {
+    if (rowIsError(r)) {
         return null;
     }
     return r;
@@ -473,7 +488,7 @@ async function applyPrivacyPolicyForEnt(viewer, ent, data, fieldPrivacyOptions)
 }
 async function applyPrivacyPolicyForEntX(viewer, ent, data, options) {
     const r = await applyPrivacyPolicyForEnt(viewer, ent, data, options);
-    if (r instanceof Error) {
+    if (rowIsError(r)) {
         throw r;
     }
     if (r === null) {
@@ -919,7 +934,7 @@ async function loadEdgeDatas(...edgeTypes) {
         if (!row) {
             return;
         }
-        if (row instanceof Error) {
+        if (rowIsError(row)) {
             throw row;
         }
         m.set(row["edge_type"], new AssocEdgeData(row));
@@ -1088,7 +1103,7 @@ async function loadNodesByEdge(viewer, id1, edgeType, options) {
 exports.loadNodesByEdge = loadNodesByEdge;
 async function applyPrivacyPolicyForRow(viewer, options, row) {
     const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
-    return r instanceof Error ? null : r;
+    return rowIsError(r) ? null : r;
 }
 exports.applyPrivacyPolicyForRow = applyPrivacyPolicyForRow;
 async function applyPrivacyPolicyForRowImpl(viewer, options, row) {

package/core/privacy.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyImpl = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.DelayedResultRule = exports.AllowIfConditionAppliesRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.DenyIfFuncRule = exports.AllowIfFuncRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedInRule = exports.DenyIfLoggedOutRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = void 0;
+const types_1 = require("util/types");
 const base_1 = require("./base");
 const ent_1 = require("./ent");
 // copied from ./base
@@ -102,7 +103,10 @@ class AllowIfFuncRule {
         this.fn = fn;
     }
     async apply(v, ent) {
-        const result = await this.fn(v, ent);
+        let result = this.fn(v, ent);
+        if ((0, types_1.isPromise)(result)) {
+            result = await result;
+        }
         if (result) {
             return (0, base_1.Allow)();
         }
@@ -115,7 +119,10 @@ class DenyIfFuncRule {
         this.fn = fn;
     }
     async apply(v, ent) {
-        const result = await this.fn(v, ent);
+        let result = this.fn(v, ent);
+        if ((0, types_1.isPromise)(result)) {
+            result = await result;
+        }
         if (result) {
             return (0, base_1.Deny)();
         }
@@ -424,12 +431,14 @@ class DelayedResultRule {
         this.fn = fn;
     }
     async apply(v, ent) {
-        const rule = await this.fn(v, ent);
+        let rule = this.fn(v, ent);
+        if ((0, types_1.isPromise)(rule)) {
+            rule = await rule;
+        }
         if (!rule) {
             return (0, base_1.Skip)();
         }
-        const res = await rule.apply(v, ent);
-        return res;
+        return rule.apply(v, ent);
     }
 }
 exports.DelayedResultRule = DelayedResultRule;

package/core/query/query.js

@@ -32,8 +32,8 @@ const clause = __importStar(require("../clause"));
 const memoizee_1 = __importDefault(require("memoizee"));
 const privacy_1 = require("../privacy");
 const uuid_1 = require("uuid");
-const util_1 = require("util");
 const query_impl_1 = require("../query_impl");
+const types_1 = require("util/types");
 // TODO can we generalize EdgeQuery to support any clause
 function assertPositive(n) {
     if (n < 0) {
@@ -108,7 +108,7 @@ class FirstFilter {
             });
             if (this.offset) {
                 const res = this.edgeQuery.getTableName();
-                const tableName = util_1.types.isPromise(res) ? await res : res;
+                const tableName = (0, types_1.isPromise)(res) ? await res : res;
                 // inner col time
                 options.clause = clause.PaginationMultipleColsSubQuery(this.sortCol, less ? "<" : ">", tableName, this.options.cursorCol, this.offset);
             }
@@ -174,7 +174,7 @@ class LastFilter {
         options.limit = this.options.limit + 1; // fetch an extra so we know if previous pag
         if (this.options.cursorCol !== this.sortCol) {
             const res = this.edgeQuery.getTableName();
-            const tableName = util_1.types.isPromise(res) ? await res : res;
+            const tableName = (0, types_1.isPromise)(res) ? await res : res;
             if (this.offset) {
                 // inner col time
                 options.clause = clause.PaginationMultipleColsSubQuery(this.sortCol, greater ? ">" : "<", tableName, this.options.cursorCol, this.offset);
@@ -389,7 +389,7 @@ class BaseEdgeQuery {
         for (const filter of this.filters) {
             if (filter.query) {
                 let res = filter.query(options);
-                options = util_1.types.isPromise(res) ? await res : res;
+                options = (0, types_1.isPromise)(res) ? await res : res;
             }
         }
         await this.loadRawData(idsInfo, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha159",
+  "version": "0.1.0-alpha160-test1",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,7 +8,6 @@
     "example": "examples"
   },
   "dependencies": {
-    "@swc-node/register": "^1.6.5",
     "@types/node": "^20.2.5",
     "camel-case": "^4.1.2",
     "cosmiconfig": "^8.1.3",
@@ -31,7 +30,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "better-sqlite3": "^7.4.1",
+    "better-sqlite3": "^8.4.0",
     "graphql": "^16.5.0"
   },
   "peerDependenciesMeta": {
@@ -40,7 +39,7 @@
     }
   },
   "engines": {
-    "node": ">=14.0"
+    "node": ">=16.0"
   },
   "devDependencies": {},
   "scripts": {},

package/schema/field.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.NumberField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const camel_case_1 = require("camel-case");
-const util_1 = require("util");
+const types_1 = require("util/types");
 const uuid_1 = require("uuid");
 const base_1 = require("../core/base");
 const db_1 = __importStar(require("../core/db"));
@@ -727,7 +727,7 @@ class ListField extends BaseField {
             return true;
         }
         const res = valid.apply(this.field, [val[0]]);
-        if (util_1.types.isPromise(res)) {
+        if ((0, types_1.isPromise)(res)) {
             const ret = await Promise.all(val.map(async (v) => await valid.apply(this.field, [v])));
             return ret.every((v) => v);
         }

package/testutils/db/temp_db.js

@@ -496,7 +496,14 @@ class TempDB {
         if (this.dialect === db_1.Dialect.SQLite) {
             this.sqlite.close();
             if (!this.sqlite.memory) {
-                fs.rmSync(this.getSqliteClient().name);
+                const f = this.getSqliteClient().name;
+                fs.rmSync(f);
+                fs.rmSync(`${f}-shm`, {
+                    force: true,
+                });
+                fs.rmSync(`${f}-wal`, {
+                    force: true,
+                });
             }
             return;
         }