@snowtop/ent 0.0.33 → 0.0.34

package/action/action.d.ts

@@ -14,6 +14,7 @@ export interface Builder<T extends Ent> {
     build(): Promise<Changeset<T>>;
     operation: WriteOperation;
     editedEnt?(): Promise<T | null>;
+    nodeType: string;
 }
 export interface Executor extends Iterable<DataOperation>, Iterator<DataOperation> {
     placeholderID: ID;

package/core/base.d.ts

@@ -92,6 +92,12 @@ export interface LoadEntOptions<T extends Ent> extends LoadableEntOptions<T>, Se
 export interface LoadCustomEntOptions<T extends Ent> extends SelectBaseDataOptions {
     ent: EntConstructor<T>;
 }
+export interface LoaderInfo {
+    tableName: string;
+    fields: string[];
+    nodeType: string;
+    loaderFactory: LoaderFactory<any, Data | null>;
+}
 export interface EditEntOptions<T extends Ent> extends LoadableEntOptions<T>, EditRowOptions {
 }
 declare enum privacyResult {

package/package.json

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

package/schema/field.js

@@ -22,7 +22,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UUIDListType = 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.EnumType = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
-const camel_case_1 = require("camel-case");
 const db_1 = __importStar(require("../core/db"));
 const schema_1 = require("./schema");
 const util_1 = require("util");
@@ -84,8 +83,8 @@ class UUIDField extends BaseField {
             }
         }
         if (options.fieldEdge?.enforceSchema &&
-            !options.fieldEdge.getLoaderOptions) {
-            throw new Error(`cannot enforceSchema if getLoaderOptions wasn't passed in`);
+            !options.fieldEdge.getLoaderInfoFromSchema) {
+            throw new Error(`cannot enforceSchema if getLoaderInfoFromSchema wasn't passed in`);
         }
     }
     isBuilder(val) {
@@ -95,19 +94,17 @@ class UUIDField extends BaseField {
         if (!this.options.fieldEdge?.enforceSchema) {
             return true;
         }
-        // TODO #510 consistency.
-        const f = (0, camel_case_1.camelCase)(this.options.fieldEdge.schema);
-        const getLoaderOptions = this.options.fieldEdge.getLoaderOptions;
-        const loadRowOptions = getLoaderOptions(f);
-        if (!loadRowOptions) {
-            throw new Error(`couldn't get loaderOptions for ${f}`);
+        const getLoaderInfo = this.options.fieldEdge.getLoaderInfoFromSchema;
+        const loaderInfo = getLoaderInfo(this.options.fieldEdge.schema);
+        if (!loaderInfo) {
+            throw new Error(`couldn't get loaderInfo for ${this.options.fieldEdge.schema}`);
         }
         if (this.isBuilder(val)) {
-            // if builder, the ent type of the builder and the ent type returned by the load constructor should match
-            return val.ent === loadRowOptions.ent;
+            // if builder, the nodeType of the builder and the nodeType of the loaderInfo should match
+            return val.nodeType === loaderInfo.nodeType;
         }
         // TODO we need context here to make sure that we hit local cache
-        const row = await loadRowOptions.loaderFactory.createLoader().load(val);
+        const row = await loaderInfo.loaderFactory.createLoader().load(val);
         return row !== null;
     }
 }

package/schema/schema.d.ts

@@ -1,4 +1,4 @@
-import { Data, Ent, LoadEntOptions } from "../core/base";
+import { Data, Ent, LoaderInfo } from "../core/base";
 import { Builder } from "../action/action";
 export default interface Schema {
     fields: Field[];
@@ -102,7 +102,7 @@ export interface ForeignKey {
     disableIndex?: boolean;
     disableBuilderType?: boolean;
 }
-declare type getLoaderOptionsFn = (type: any) => LoadEntOptions<Ent>;
+declare type getLoaderInfoFn = (type: string) => LoaderInfo;
 export interface InverseFieldEdge {
     name: string;
     edgeConstName?: string;
@@ -113,7 +113,7 @@ export interface FieldEdge {
     schema: string;
     inverseEdge?: string | InverseFieldEdge;
     enforceSchema?: boolean;
-    getLoaderOptions?: getLoaderOptionsFn;
+    getLoaderInfoFromSchema?: getLoaderInfoFn;
     disableBuilderType?: boolean;
 }
 export interface FieldOptions {
@@ -171,6 +171,7 @@ export interface ActionField {
     nullable?: boolean | NullableListOptions;
     list?: boolean;
     actionName?: string;
+    excludedFields?: string[];
 }
 export interface Action {
     operation: ActionOperation;

package/testutils/builder.d.ts

@@ -71,6 +71,7 @@ export declare class SimpleBuilder<T extends Ent> implements Builder<T> {
     placeholderID: ID;
     orchestrator: Orchestrator<T>;
     fields: Map<string, any>;
+    nodeType: string;
     constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined, action?: Action<T> | undefined);
     build(): Promise<Changeset<T>>;
     editedEnt(): Promise<T | null>;

package/testutils/builder.js

@@ -13,6 +13,7 @@ const pluralize_1 = __importDefault(require("pluralize"));
 const snake_case_1 = require("snake-case");
 const loaders_1 = require("../core/loaders");
 const convert_1 = require("../core/convert");
+const camel_case_1 = require("camel-case");
 class User {
     constructor(viewer, data) {
         this.viewer = viewer;
@@ -126,6 +127,7 @@ class SimpleBuilder {
         }
         this.ent = schema.ent;
         const tableName = getTableName(schema);
+        this.nodeType = (0, camel_case_1.camelCase)(schema.ent.name);
         this.orchestrator = new orchestrator_1.Orchestrator({
             viewer: this.viewer,
             operation: operation,