@snowtop/ent 0.1.0-alpha95 → 0.1.0-alpha96

package/core/db.js

@@ -39,13 +39,16 @@ var Dialect;
     Dialect["Postgres"] = "postgres";
     Dialect["SQLite"] = "sqlite";
 })(Dialect = exports.Dialect || (exports.Dialect = {}));
-function parseConnectionString(str) {
+function parseConnectionString(str, args) {
     if (str.startsWith("sqlite:///")) {
         let filePath = str.substr(10);
         return {
             dialect: Dialect.SQLite,
             config: {
                 connectionString: str,
+                // TODO would like to do this for other args e.g. max being set but would have to update tests
+                // e.g. src/core/config.test.ts which tests this
+                // ...args?.db,
             },
             filePath,
         };
@@ -54,6 +57,9 @@ function parseConnectionString(str) {
         dialect: Dialect.Postgres,
         config: {
             connectionString: str,
+            // TODO would like to do this for other args e.g. max being set but would have to update tests
+            // e.g. src/core/config.test.ts which tests this
+            // ...args?.db,
         },
     };
 }
@@ -67,12 +73,12 @@ function getClientConfig(args) {
     // if there's a db connection string, use that first
     const str = process.env.DB_CONNECTION_STRING;
     if (str) {
-        return parseConnectionString(str);
+        return parseConnectionString(str, args);
     }
     let file = "config/database.yml";
     if (args) {
         if (args.connectionString) {
-            return parseConnectionString(args.connectionString);
+            return parseConnectionString(args.connectionString, args);
         }
         if (args.db) {
             let db;
@@ -162,6 +168,10 @@ class DB {
     async endPool() {
         return this.q.close();
     }
+    emitsExplicitTransactionStatements() {
+        const instance = DB.getInstance();
+        return instance.q.runInTransaction === undefined;
+    }
     // throws if invalid
     static getInstance() {
         if (DB.instance) {
@@ -196,8 +206,6 @@ exports.defaultTimestampParser = pg_1.default.types.getTypeParser(pg_1.default.t
 // it's parsed as UTC time as opposed to the local time
 pg_1.default.types.setTypeParser(pg_1.default.types.builtins.TIMESTAMP, function (val) {
     return luxon_1.DateTime.fromSQL(val + "Z").toJSDate();
-    // let d = new Date(val + "Z");
-    // return d;
 });
 class Sqlite {
     constructor(db) {
@@ -316,7 +324,7 @@ class Postgres {
         };
     }
     async close() {
-        return this.pool.end();
+        return await this.pool.end();
     }
 }
 exports.Postgres = Postgres;

package/core/ent.d.ts

@@ -30,7 +30,7 @@ interface parameterizedQueryOptions {
     values?: any[];
     logValues?: any[];
 }
-export declare type CustomQuery = string | parameterizedQueryOptions | clause.Clause | QueryDataOptions;
+export type CustomQuery = string | parameterizedQueryOptions | clause.Clause | QueryDataOptions;
 /**
  * Note that if there's default read transformations (e.g. soft delete) and a clause is passed in
  * either as Clause or QueryDataOptions without {disableTransformations: true}, the default transformation
@@ -61,8 +61,10 @@ interface CustomCountOptions extends DataOptions {
 export declare function loadCustomCount(options: CustomCountOptions, query: CustomQuery, context: Context | undefined): Promise<number>;
 export declare function loadDerivedEnt<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, data: Data, loader: new (viewer: TViewer, data: Data) => TEnt): Promise<TEnt | null>;
 export declare function loadDerivedEntX<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, data: Data, loader: new (viewer: TViewer, data: Data) => TEnt): Promise<TEnt>;
+export declare function logQuery(query: string, logValues: any[]): void;
 export declare function loadRowX(options: LoadRowOptions): Promise<Data>;
 export declare function loadRow(options: LoadRowOptions): Promise<Data | null>;
+export declare function ___setLogQueryErrorWithError(val: boolean | undefined): void;
 export declare function performRawQuery(query: string, values: any[], logValues?: any[]): Promise<Data[]>;
 export declare function loadRows(options: LoadRowsOptions): Promise<Data[]>;
 export declare function buildQuery(options: QueryableDataOptions): string;

package/core/ent.js

@@ -26,8 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = 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.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.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = void 0;
+exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = 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.___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.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -517,6 +517,9 @@ async function doFieldPrivacy(viewer, ent, data, options) {
     }
     const promises = [];
     let somethingChanged = false;
+    const origData = {
+        ...data,
+    };
     for (const [k, policy] of options.fieldPrivacy) {
         const curr = data[k];
         if (curr === null || curr === undefined) {
@@ -534,8 +537,11 @@ async function doFieldPrivacy(viewer, ent, data, options) {
     await Promise.all(promises);
     if (somethingChanged) {
         // have to create new instance
-        return new options.ent(viewer, data);
+        const ent = new options.ent(viewer, data);
+        ent.__setRawDBData(origData);
+        return ent;
     }
+    ent.__setRawDBData(origData);
     return ent;
 }
 function logQuery(query, logValues) {
@@ -545,6 +551,7 @@ function logQuery(query, logValues) {
     });
     (0, logger_1.logTrace)();
 }
+exports.logQuery = logQuery;
 // TODO long term figure out if this API should be exposed
 async function loadRowX(options) {
     const result = await loadRow(options);
@@ -582,12 +589,26 @@ async function loadRow(options) {
     return res.rows[0];
 }
 exports.loadRow = loadRow;
+var _logQueryWithError = false;
+function ___setLogQueryErrorWithError(val) {
+    _logQueryWithError = val || false;
+}
+exports.___setLogQueryErrorWithError = ___setLogQueryErrorWithError;
 // 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 || []);
-    const res = await pool.queryAll(query, values);
-    return res.rows;
+    try {
+        const res = await pool.queryAll(query, values);
+        return res.rows;
+    }
+    catch (e) {
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\``);
+        }
+        throw e;
+    }
 }
 exports.performRawQuery = performRawQuery;
 // TODO this should throw, we can't be hiding errors here
@@ -1145,11 +1166,20 @@ async function mutateRow(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
     let res;
-    if (isSyncQueryer(queryer)) {
-        res = queryer.execSync(query, values);
+    try {
+        if (isSyncQueryer(queryer)) {
+            res = queryer.execSync(query, values);
+        }
+        else {
+            res = await queryer.exec(query, values);
+        }
     }
-    else {
-        res = await queryer.exec(query, values);
+    catch (e) {
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\``);
+        }
+        throw e;
     }
     if (cache) {
         cache.clearCache();
@@ -1159,11 +1189,20 @@ async function mutateRow(queryer, query, values, logValues, options) {
 function mutateRowSync(queryer, query, values, logValues, options) {
     logQuery(query, logValues);
     let cache = options.context?.cache;
-    const res = queryer.execSync(query, values);
-    if (cache) {
-        cache.clearCache();
+    try {
+        const res = queryer.execSync(query, values);
+        if (cache) {
+            cache.clearCache();
+        }
+        return res;
+    }
+    catch (e) {
+        if (_logQueryWithError) {
+            const msg = e.message;
+            throw new Error(`error \`${msg}\` running query: \`${query}\``);
+        }
+        throw e;
     }
-    return res;
 }
 function buildInsertQuery(options, suffix) {
     let fields = [];
@@ -1222,22 +1261,33 @@ function buildUpdateQuery(options, suffix) {
     const dialect = db_1.default.getDialect();
     let idx = 1;
     for (const key in options.fields) {
-        const val = options.fields[key];
-        values.push(val);
-        if (options.fieldsToLog) {
-            logValues.push(options.fieldsToLog[key]);
-        }
-        // TODO would be nice to use clause here. need update version of the queries so that
-        // we don't have to handle dialect specifics here
-        // can't use clause because of IS NULL
-        // valsString.push(clause.Eq(key, val).clause(idx));
-        if (dialect === db_1.Dialect.Postgres) {
-            valsString.push(`${key} = $${idx}`);
+        if (options.expressions && options.expressions.has(key)) {
+            const cls = options.expressions.get(key);
+            valsString.push(`${key} = ${cls.clause(idx)}`);
+            // TODO need to test a clause with more than one value...
+            const newVals = cls.values();
+            idx += newVals.length;
+            values.push(...newVals);
+            logValues.push(...cls.logValues());
         }
         else {
-            valsString.push(`${key} = ?`);
+            const val = options.fields[key];
+            values.push(val);
+            if (options.fieldsToLog) {
+                logValues.push(options.fieldsToLog[key]);
+            }
+            // TODO would be nice to use clause here. need update version of the queries so that
+            // we don't have to handle dialect specifics here
+            // can't use clause because of IS NULL
+            // valsString.push(clause.Eq(key, val).clause(idx));
+            if (dialect === db_1.Dialect.Postgres) {
+                valsString.push(`${key} = $${idx}`);
+            }
+            else {
+                valsString.push(`${key} = ?`);
+            }
+            idx++;
         }
-        idx++;
     }
     const vals = valsString.join(", ");
     let query = `UPDATE ${options.tableName} SET ${vals} WHERE `;

package/core/logger.d.ts

@@ -1,4 +1,4 @@
-declare type logType = "query" | "warn" | "info" | "error" | "debug" | "cache";
+type logType = "query" | "warn" | "info" | "error" | "debug" | "cache";
 export declare function setLogLevels(levels: logType | logType[]): void;
 export declare function clearLogLevels(): void;
 export declare function log(level: logType, msg: any): void;

package/core/query/assoc_query.d.ts

@@ -3,8 +3,8 @@ import { AssocEdge } from "../ent";
 import { AssocEdgeCountLoaderFactory } from "../loaders/assoc_count_loader";
 import { AssocEdgeLoaderFactory } from "../loaders/assoc_edge_loader";
 import { EdgeQuery, BaseEdgeQuery, IDInfo } from "./query";
-export declare type EdgeQuerySource<TSource extends Ent<TViewer>, TDest extends Ent<TViewer> = Ent<any>, TViewer extends Viewer = Viewer> = TSource | TSource[] | ID | ID[] | EdgeQuery<TDest, Ent, AssocEdge>;
-declare type loaderOptionsFunc<TViewer extends Viewer> = (type: string) => LoadEntOptions<Ent, TViewer>;
+export type EdgeQuerySource<TSource extends Ent<TViewer>, TDest extends Ent<TViewer> = Ent<any>, TViewer extends Viewer = Viewer> = TSource | TSource[] | ID | ID[] | EdgeQuery<TDest, Ent, AssocEdge>;
+type loaderOptionsFunc<TViewer extends Viewer> = (type: string) => LoadEntOptions<Ent, TViewer>;
 export declare abstract class AssocEdgeQueryBase<TSource extends Ent<TViewer>, TDest extends Ent<TViewer>, TEdge extends AssocEdge, TViewer extends Viewer = Viewer> extends BaseEdgeQuery<TSource, TDest, TEdge> implements EdgeQuery<TSource, TDest, TEdge> {
     viewer: TViewer;
     src: EdgeQuerySource<TSource, TDest, TViewer>;

package/core/query/shared_assoc_test.js

@@ -610,10 +610,9 @@ function assocTests(ml, global = false) {
         let user;
         let friendRequests;
         let user2;
-        let friendRequests2;
         beforeEach(async () => {
             [user, friendRequests] = await (0, test_helpers_1.createUserPlusFriendRequests)();
-            [user2, friendRequests2] = await (0, test_helpers_1.createUserPlusFriendRequests)();
+            [user2] = await (0, test_helpers_1.createUserPlusFriendRequests)();
         });
         function getQuery(viewer) {
             return index_1.UserToIncomingFriendRequestsQuery.query(viewer || user.viewer, [

package/core/query/shared_test.js

@@ -80,7 +80,6 @@ const commonTests = (opts) => {
             this.verifyEdges(edges);
         }
         verifyEdges(edges) {
-            const q = this.getQuery();
             // TODO sad not generic enough
             if (this.customQuery) {
                 (0, test_helpers_1.verifyUserToContactRawData)(this.user, edges, this.filteredContacts);

package/graphql/graphql.d.ts

@@ -10,8 +10,8 @@ export interface CustomType {
     tsImportPath?: string;
     [x: string]: any;
 }
-declare type Type = GraphQLScalarType | ClassType | string | CustomType;
-export declare type GraphQLConnection<T> = {
+type Type = GraphQLScalarType | ClassType | string | CustomType;
+export type GraphQLConnection<T> = {
     node: T;
 };
 export interface gqlFieldOptions {
@@ -24,7 +24,7 @@ export interface gqlObjectOptions {
     name?: string;
     description?: string;
 }
-declare type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
+type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
 export declare enum CustomFieldType {
     Accessor = "ACCESSOR",
     Field = "FIELD",
@@ -51,15 +51,15 @@ export interface ProcessedCustomField extends CustomFieldImpl {
     args: ProcessedField[];
     results: ProcessedField[];
 }
-export declare type ProcessCustomFieldMap = {
-    [key: string]: ProcessedCustomField;
+export type ProcessCustomFieldMap = {
+    [key: string]: ProcessedCustomField[];
 };
 export interface CustomObject {
     nodeName: string;
     className: string;
     description?: string;
 }
-declare type NullableListOptions = "contents" | "contentsAndList";
+type NullableListOptions = "contents" | "contentsAndList";
 interface FieldImpl {
     type: string;
     tsType?: string;

package/graphql/graphql.js

@@ -443,6 +443,7 @@ class GQLCapture {
         this.customInputObjects.forEach((_val, key) => baseArgs.set(key, true));
         baseArgs.set("Context", true);
         this.customTypes.forEach((_val, key) => baseArgs.set(key, true));
+        // TODO this should be aware of knownCustomTypes
         const resolveFields = (fields) => {
             fields.forEach((field) => {
                 // we have a check earlier that *should* make this path impossible

package/graphql/query/connection_type.d.ts

@@ -2,7 +2,7 @@ import { GraphQLFieldConfigMap, GraphQLObjectType, GraphQLInterfaceType } from "
 import { RequestContext } from "../../core/context";
 import { GraphQLEdge } from "./edge_connection";
 import { Data } from "../../core/base";
-declare type nodeType = GraphQLObjectType | GraphQLInterfaceType;
+type nodeType = GraphQLObjectType | GraphQLInterfaceType;
 export declare class GraphQLEdgeType<TNode extends nodeType, TEdge extends Data> extends GraphQLObjectType {
     constructor(name: string, nodeType: TNode, optionalFields?: () => GraphQLFieldConfigMap<GraphQLEdge<TEdge>, RequestContext>);
 }

package/graphql/query/shared_assoc_test.js

@@ -139,7 +139,7 @@ function sharedAssocTests() {
         const conn = new connection_type_1.GraphQLConnectionType("CustomEdge", eventType);
         const length = (m) => {
             let count = 0;
-            for (let k in m) {
+            for (let _ in m) {
                 count++;
             }
             return count;

package/graphql/query/shared_edge_connection.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
-const pg_1 = require("pg");
 const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
-const db_mock_1 = require("../../testutils/db_mock");
 const edge_connection_1 = require("./edge_connection");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
-jest.mock("pg");
-db_mock_1.QueryRecorder.mockPool(pg_1.Pool);
 class TestConnection {
     constructor(getQuery, ents, filter) {
         this.getQuery = getQuery;

package/imports/index.d.ts

@@ -1,5 +1,6 @@
 export interface Options {
     filter?: (file: string, index: number, array: string[]) => boolean;
+    justCurrentDir?: boolean;
     ignore?: string | Readonly<string[]> | undefined;
 }
 export interface PathResult {
@@ -10,7 +11,11 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
+interface ParseInput {
+    root: string;
+    opts?: Options;
+}
+export declare function parseCustomImports(filePath: string, inputs: ParseInput[]): PathResult;
 export interface importInfo {
     name: string;
     importPath: string;

package/imports/index.js

@@ -38,7 +38,11 @@ function getFiles(filePath, opts) {
     }
     // graphql path should be passed to this
     // this is more agnostic about what it expect here
-    let files = glob_1.default.sync(`${filePath}/**/*.ts`, {
+    let pattern = `${filePath}/**/*.ts`;
+    if (opts?.justCurrentDir) {
+        pattern = `${filePath}/**.ts`;
+    }
+    let files = glob_1.default.sync(pattern, {
         ignore: opts?.ignore,
     });
     if (opts?.filter) {
@@ -46,8 +50,15 @@ function getFiles(filePath, opts) {
     }
     return files;
 }
-function parseCustomImports(filePath, opts) {
-    const files = getFiles(filePath, opts);
+function parseCustomImports(filePath, inputs) {
+    const files = [];
+    // simplifies tests and other simple callsites
+    if (inputs.length === 0) {
+        inputs.push({ root: filePath });
+    }
+    for (const input of inputs) {
+        files.push(...getFiles(input.root, input.opts));
+    }
     const options = (0, compilerOptions_1.readCompilerOptions)(filePath);
     let classMap = new Map();
     files.forEach((file) => {

package/index.d.ts

@@ -7,6 +7,7 @@ export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, D
 export * from "./core/query";
 export * from "./schema/";
 import * as q from "./core/clause";
+export { Clause } from "./core/clause";
 declare const query: {
     Eq: typeof q.Eq;
     NotEq: typeof q.NotEq;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha95",
+  "version": "0.1.0-alpha96",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,27 +8,27 @@
     "example": "examples"
   },
   "dependencies": {
-    "@types/node": "^15.0.2",
+    "@types/node": "^18.11.18",
     "camel-case": "^4.1.2",
-    "cosmiconfig": "^7.0.1",
-    "dataloader": "^2.0.0",
+    "cosmiconfig": "^8.0.0",
+    "dataloader": "^2.1.0",
     "glob": "^8.0.3",
-    "graph-data-structure": "^1.12.0",
+    "graph-data-structure": "^2.0.0",
     "js-yaml": "^4.1.0",
-    "json5": "^2.1.3",
-    "luxon": "^1.25.0",
+    "json5": "^2.2.2",
+    "luxon": "^3.1.1",
     "memoizee": "^0.4.15",
-    "minimist": "^1.2.6",
+    "minimist": "^1.2.7",
     "pascal-case": "^3.1.2",
-    "pg": "^8.0.3",
-    "prettier": "^2.3.2",
+    "pg": "^8.8.0",
+    "prettier": "^2.8.1",
     "reflect-metadata": "^0.1.13",
-    "snake-case": "^3.0.3",
-    "ts-node": "^10.2.1",
-    "tsconfig-paths": "^3.11.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.4.2",
-    "uuid": "^8.3.2"
+    "snake-case": "^3.0.4",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.1.1",
+    "tslib": "^2.4.1",
+    "typescript": "^4.9.4",
+    "uuid": "^9.0.0"
   },
   "peerDependencies": {
     "better-sqlite3": "^7.4.1",

package/parse_schema/parse.d.ts

@@ -5,10 +5,10 @@ declare enum NullableResult {
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
-declare type ProcessedActionField = Omit<ActionField, "nullable"> & {
+type ProcessedActionField = Omit<ActionField, "nullable"> & {
     nullable?: NullableResult;
 };
-declare type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActions"> & {
+type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActions"> & {
     patternName?: string;
     edgeActions?: OutputAction[];
 };
@@ -18,7 +18,7 @@ interface TransformFlags {
     transformsInsert?: boolean;
     transformsUpdate?: boolean;
 }
-declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & TransformFlags & {
+type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & TransformFlags & {
     actions: OutputAction[];
     assocEdges: ProcessedAssocEdge[];
     assocEdgeGroups: ProcessedAssocEdgeGroup[];
@@ -26,10 +26,10 @@ declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" |
     schemaPath?: string;
     patternNames?: string[];
 };
-declare type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
+type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
     edgeAction?: OutputAction;
 };
-declare type OutputAction = Omit<Action, "actionOnlyFields"> & {
+type OutputAction = Omit<Action, "actionOnlyFields"> & {
     actionOnlyFields?: ProcessedActionField[];
 };
 interface schemasDict {
@@ -41,12 +41,12 @@ interface ProcessedPattern {
     fields: ProcessedField[];
     disableMixin?: boolean;
 }
-declare type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
+type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
     subFields?: ProcessedField[];
     listElemType?: ProcessedType;
     unionFields?: ProcessedField[];
 };
-declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
+type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
     name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;

package/schema/base_schema.d.ts

@@ -1,11 +1,11 @@
-import { Field, FieldMap, Pattern, FieldOverrideMap } from "./schema";
+import { FieldMap, Pattern, FieldOverrideMap } from "./schema";
 import { Action, AssocEdgeGroup, Constraint, Edge, Index, Schema } from ".";
 export declare const Timestamps: Pattern;
 export declare const Node: Pattern;
 export interface SchemaConfig extends Schema {
 }
 export declare class EntSchema implements Schema {
-    fields: FieldMap | Field[];
+    fields: FieldMap;
     fieldOverrides: FieldOverrideMap | undefined;
     tableName: string | undefined;
     patterns: Pattern[];
@@ -22,7 +22,7 @@ export declare class EntSchema implements Schema {
     constructor(cfg: SchemaConfig);
 }
 export declare class EntSchemaWithTZ implements Schema {
-    fields: FieldMap | Field[];
+    fields: FieldMap;
     fieldOverrides: FieldOverrideMap | undefined;
     tableName: string | undefined;
     patterns: Pattern[];

package/schema/field.js

@@ -527,7 +527,7 @@ class EnumField extends BaseField {
             }
             if (options.map) {
                 let count = 0;
-                for (const k in options.map) {
+                for (const _ in options.map) {
                     count++;
                     break;
                 }
@@ -594,7 +594,7 @@ class IntegerEnumField extends BaseField {
             deprecatedIntEnumMap: options.deprecated,
         };
         let count = 0;
-        for (const k in options.map) {
+        for (const _ in options.map) {
             count++;
             break;
         }