@snowtop/ent 0.0.35 → 0.1.0-alpha3

package/action/action.d.ts

@@ -32,24 +32,24 @@ export interface Changeset<T extends Ent> {
     dependencies?: Map<ID, Builder<Ent>>;
 }
 export declare type TriggerReturn = void | Promise<Changeset<Ent> | void | (Changeset<Ent> | void)[]> | Promise<Changeset<Ent>>[];
-export interface Trigger<T extends Ent> {
-    changeset(builder: Builder<T>, input: Data): TriggerReturn;
+export interface Trigger<TBuilder extends Builder<Ent>, TData extends Data> {
+    changeset(builder: TBuilder, input: TData): TriggerReturn;
 }
-export interface Observer<T extends Ent> {
-    observe(builder: Builder<T>, input: Data): void | Promise<void>;
+export interface Observer<TBuilder extends Builder<Ent>, TData extends Data> {
+    observe(builder: TBuilder, input: TData): void | Promise<void>;
 }
-export interface Validator<T extends Ent> {
-    validate(builder: Builder<T>, input: Data): Promise<void> | void;
+export interface Validator<TBuilder extends Builder<Ent>, TData extends Data> {
+    validate(builder: TBuilder, input: TData): Promise<void> | void;
 }
-export interface Action<T extends Ent> {
+export interface Action<TEnt extends Ent, TBuilder extends Builder<TEnt>, TData extends Data> {
     readonly viewer: Viewer;
-    changeset(): Promise<Changeset<T>>;
-    builder: Builder<T>;
-    getPrivacyPolicy(): PrivacyPolicy;
-    triggers?: Trigger<T>[];
-    observers?: Observer<T>[];
-    validators?: Validator<T>[];
-    getInput(): Data;
+    changeset(): Promise<Changeset<TEnt>>;
+    builder: TBuilder;
+    getPrivacyPolicy(): PrivacyPolicy<TEnt>;
+    triggers?: Trigger<TBuilder, TData>[];
+    observers?: Observer<TBuilder, TData>[];
+    validators?: Validator<TBuilder, TData>[];
+    getInput(): TData;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     viewerForEntLoad?(data: Data): Viewer | Promise<Viewer>;

package/action/experimental_action.d.ts

@@ -1,8 +1,8 @@
 import { Viewer, Ent, Data } from "../core/base";
 import { Action, WriteOperation, Builder, Trigger, Observer, Changeset, Validator } from "./action";
-export interface ActionOptions<T extends Ent> {
+export interface ActionOptions<T extends Ent, TData extends Data> {
     existingEnt?: T | null;
-    input?: {};
+    input?: TData;
     operation?: WriteOperation;
 }
 interface EntBuilder<T extends Ent> extends Builder<T> {
@@ -13,28 +13,28 @@ interface EntBuilder<T extends Ent> extends Builder<T> {
     editedEnt(): Promise<T | null>;
     editedEntX(): Promise<T>;
 }
-export declare class BaseAction<T extends Ent> implements Action<T> {
+export declare class BaseAction<TEnt extends Ent, TData extends Data> implements Action<TEnt, EntBuilder<TEnt>, TData> {
     viewer: Viewer;
-    builderCtr: BuilderConstructor<T>;
-    builder: EntBuilder<T>;
+    builderCtr: BuilderConstructor<TEnt, TData>;
+    builder: EntBuilder<TEnt>;
     private input;
-    triggers: Trigger<Ent>[];
-    observers: Observer<Ent>[];
-    validators: Validator<Ent>[];
-    getPrivacyPolicy(): import("../core/base").PrivacyPolicy;
-    constructor(viewer: Viewer, builderCtr: BuilderConstructor<T>, options?: ActionOptions<T> | null);
-    static createBuilder<T extends Ent>(viewer: Viewer, builderCtr: BuilderConstructor<T>, options?: ActionOptions<T> | null): Builder<T>;
-    static bulkAction<T extends Ent>(ent: T, builderCtr: BuilderConstructor<T>, ...actions: Action<Ent>[]): BaseAction<T>;
-    changeset(): Promise<Changeset<T>>;
+    triggers: Trigger<EntBuilder<TEnt>, TData>[];
+    observers: Observer<EntBuilder<TEnt>, TData>[];
+    validators: Validator<EntBuilder<TEnt>, TData>[];
+    getPrivacyPolicy(): import("../core/base").PrivacyPolicy<Ent>;
+    constructor(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TData>, options?: ActionOptions<TEnt, TData> | null);
+    static createBuilder<TEnt extends Ent, TData extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TData>, options?: ActionOptions<TEnt, TData> | null): Builder<TEnt>;
+    static bulkAction<TEnt extends Ent, TData extends Data>(ent: TEnt, builderCtr: BuilderConstructor<TEnt, TData>, ...actions: Action<Ent, Builder<Ent>, Data>[]): BaseAction<TEnt, TData>;
+    changeset(): Promise<Changeset<TEnt>>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    save(): Promise<T | null>;
-    saveX(): Promise<T>;
-    getInput(): {};
+    save(): Promise<TEnt | null>;
+    saveX(): Promise<TEnt>;
+    getInput(): TData;
 }
-interface BuilderConstructor<T extends Ent> {
-    new (viewer: Viewer, operation: WriteOperation, action: Action<T>, existingEnt?: T | undefined): EntBuilder<T>;
+interface BuilderConstructor<TEnt extends Ent, TData extends Data> {
+    new (viewer: Viewer, operation: WriteOperation, action: Action<TEnt, EntBuilder<TEnt>, TData>, existingEnt?: TEnt | undefined): EntBuilder<TEnt>;
 }
-export declare function updateRawObject<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt>, existingEnt: TEnt, input: TInput): Promise<TEnt>;
-export declare function getSimpleEditAction<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt>, existingEnt: TEnt, input: TInput): Action<TEnt>;
+export declare function updateRawObject<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TInput>, existingEnt: TEnt, input: TInput): Promise<TEnt>;
+export declare function getSimpleEditAction<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TInput>, existingEnt: TEnt, input: TInput): Action<TEnt, Builder<TEnt>, TInput>;
 export {};

package/action/experimental_action.js

@@ -37,7 +37,7 @@ class BaseAction {
         });
         action.triggers = [
             {
-                changeset: (builder, _input) => {
+                changeset: () => {
                     return actions.map((action) => action.changeset());
                 },
             },

package/action/orchestrator.d.ts

@@ -3,14 +3,14 @@ import { AssocEdgeInputOptions, DataOperation } from "../core/ent";
 import { SchemaInputType } from "../schema/schema";
 import { Changeset, Executor } from "../action/action";
 import { WriteOperation, Builder, Action } from "../action";
-export interface OrchestratorOptions<T extends Ent, TData extends Data> {
+export interface OrchestratorOptions<TEnt extends Ent, TData extends Data> {
     viewer: Viewer;
     operation: WriteOperation;
     tableName: string;
-    loaderOptions: LoadEntOptions<T>;
+    loaderOptions: LoadEntOptions<TEnt>;
     key: string;
-    builder: Builder<T>;
-    action?: Action<T>;
+    builder: Builder<TEnt>;
+    action?: Action<TEnt, Builder<TEnt>, TData>;
     schema: SchemaInputType;
     editedFields(): Map<string, any>;
     updateInput?: (data: TData) => void;
@@ -28,7 +28,7 @@ export declare enum edgeDirection {
     inboundEdge = 0,
     outboundEdge = 1
 }
-export declare class Orchestrator<T extends Ent> {
+export declare class Orchestrator<TEnt extends Ent, TData extends Data> {
     private options;
     private edgeSet;
     private edges;
@@ -41,7 +41,7 @@ export declare class Orchestrator<T extends Ent> {
     viewer: Viewer;
     private defaultFieldsByFieldName;
     private defaultFieldsByTSName;
-    constructor(options: OrchestratorOptions<T, Data>);
+    constructor(options: OrchestratorOptions<TEnt, TData>);
     private addEdge;
     addInboundEdge<T2 extends Ent>(id1: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
     addOutboundEdge<T2 extends Ent>(id2: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
@@ -64,11 +64,11 @@ export declare class Orchestrator<T extends Ent> {
     private formatAndValidateFields;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    build(): Promise<EntChangeset<T>>;
+    build(): Promise<EntChangeset<TEnt>>;
     private viewerForEntLoad;
     returnedRow(): Promise<Data | null>;
-    editedEnt(): Promise<T | null>;
-    editedEntX(): Promise<T>;
+    editedEnt(): Promise<TEnt | null>;
+    editedEntX(): Promise<TEnt>;
 }
 export declare class EntChangeset<T extends Ent> implements Changeset<T> {
     viewer: Viewer;

package/action/orchestrator.js

@@ -309,7 +309,7 @@ class Orchestrator {
         for (const [fieldName, field] of schemaFields) {
             let value = editedFields.get(fieldName);
             let defaultValue = undefined;
-            let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(field.name);
+            let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(fieldName);
             if (value === undefined) {
                 if (this.options.operation === action_1.WriteOperation.Insert) {
                     if (field.defaultToViewerOnCreate && field.defaultValueOnCreate) {
@@ -321,7 +321,7 @@ class Orchestrator {
                     if (field.defaultValueOnCreate) {
                         defaultValue = field.defaultValueOnCreate(builder, input);
                         if (defaultValue === undefined) {
-                            throw new Error(`defaultValueOnCreate() returned undefined for field ${field.name}`);
+                            throw new Error(`defaultValueOnCreate() returned undefined for field ${fieldName}`);
                         }
                     }
                 }
@@ -360,11 +360,11 @@ class Orchestrator {
         }
         return false;
     }
-    async transformFieldValue(field, dbKey, value) {
+    async transformFieldValue(fieldName, field, dbKey, value) {
         // now format and validate...
         if (value === null) {
             if (!field.nullable) {
-                throw new Error(`field ${field.name} set to null for non-nullable field`);
+                throw new Error(`field ${fieldName} set to null for non-nullable field`);
             }
         }
         else if (value === undefined) {
@@ -375,14 +375,14 @@ class Orchestrator {
                 // server default allowed
                 field.serverDefault === undefined &&
                 this.options.operation === action_1.WriteOperation.Insert) {
-                throw new Error(`required field ${field.name} not set`);
+                throw new Error(`required field ${fieldName} not set`);
             }
         }
         else if (this.isBuilder(value)) {
             if (field.valid) {
                 const valid = await Promise.resolve(field.valid(value));
                 if (!valid) {
-                    throw new Error(`invalid field ${field.name} with value ${value}`);
+                    throw new Error(`invalid field ${fieldName} with value ${value}`);
                 }
             }
             // keep track of dependencies to resolve
@@ -395,7 +395,7 @@ class Orchestrator {
                 // TODO this could be async. handle this better
                 const valid = await Promise.resolve(field.valid(value));
                 if (!valid) {
-                    throw new Error(`invalid field ${field.name} with value ${value}`);
+                    throw new Error(`invalid field ${fieldName} with value ${value}`);
                 }
             }
             if (field.format) {
@@ -420,8 +420,8 @@ class Orchestrator {
                 // null allowed
                 value = this.defaultFieldsByFieldName[fieldName];
             }
-            let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(field.name);
-            value = await this.transformFieldValue(field, dbKey, value);
+            let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(fieldName);
+            value = await this.transformFieldValue(fieldName, field, dbKey, value);
             if (value !== undefined) {
                 data[dbKey] = value;
                 logValues[dbKey] = field.logValue(value);
@@ -433,10 +433,10 @@ class Orchestrator {
             for (const fieldName in this.defaultFieldsByFieldName) {
                 const defaultValue = this.defaultFieldsByFieldName[fieldName];
                 let field = schemaFields.get(fieldName);
-                let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(field.name);
+                let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(fieldName);
                 // no value, let's just default
                 if (data[dbKey] === undefined) {
-                    const value = await this.transformFieldValue(field, dbKey, defaultValue);
+                    const value = await this.transformFieldValue(fieldName, field, dbKey, defaultValue);
                     data[dbKey] = value;
                     logValues[dbKey] = field.logValue(value);
                 }

package/core/base.d.ts

@@ -43,7 +43,7 @@ export interface Viewer {
 export interface Ent {
     id: ID;
     viewer: Viewer;
-    privacyPolicy: PrivacyPolicy;
+    privacyPolicy: PrivacyPolicy<this>;
     nodeType: string;
 }
 export declare type Data = {
@@ -108,20 +108,19 @@ declare enum privacyResult {
 export interface PrivacyResult {
     result: privacyResult;
     error?: PrivacyError;
-    getError?(policy: PrivacyPolicy, rule: PrivacyPolicyRule, ent?: Ent): PrivacyError;
 }
 export interface PrivacyError extends Error {
-    privacyPolicy: PrivacyPolicy;
+    privacyPolicy: PrivacyPolicy<Ent>;
     ent?: Ent;
 }
 export declare function Allow(): PrivacyResult;
 export declare function Skip(): PrivacyResult;
 export declare function Deny(): PrivacyResult;
-export declare function DenyWithReason(e: PrivacyError | string): PrivacyResult;
-export interface PrivacyPolicyRule {
-    apply(v: Viewer, ent?: Ent): Promise<PrivacyResult>;
+export declare function DenyWithReason(e: PrivacyError): PrivacyResult;
+export interface PrivacyPolicyRule<TEnt extends Ent = Ent> {
+    apply(v: Viewer, ent?: TEnt): Promise<PrivacyResult>;
 }
-export interface PrivacyPolicy {
-    rules: PrivacyPolicyRule[];
+export interface PrivacyPolicy<TEnt extends Ent = Ent> {
+    rules: PrivacyPolicyRule<TEnt>[];
 }
 export {};

package/core/base.js

@@ -30,23 +30,7 @@ function Deny() {
     return deny;
 }
 exports.Deny = Deny;
-class DenyWithReasonError extends Error {
-    constructor(privacyPolicy, rule, msg, ent) {
-        super(msg);
-        this.privacyPolicy = privacyPolicy;
-        this.privacyRule = rule;
-        this.ent = ent;
-    }
-}
 function DenyWithReason(e) {
-    if (typeof e === "string") {
-        return {
-            result: privacyResult.Deny,
-            getError(policy, rule, ent) {
-                return new DenyWithReasonError(policy, rule, e, ent);
-            },
-        };
-    }
     return {
         result: privacyResult.Deny,
         error: e,

package/core/ent.d.ts

@@ -10,7 +10,8 @@ export declare function loadEntX<T extends Ent>(viewer: Viewer, id: ID, options:
 export declare function loadEntXViaKey<T extends Ent>(viewer: Viewer, key: any, options: LoadEntOptions<T>): Promise<T>;
 export declare function loadEntFromClause<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, clause: clause.Clause): Promise<T | null>;
 export declare function loadEntXFromClause<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, clause: clause.Clause): Promise<T>;
-export declare function loadEnts<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<T[]>;
+export declare function loadEnts<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<Map<ID, T>>;
+export declare function loadEntsList<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<T[]>;
 export declare function loadEntsFromClause<T extends Ent>(viewer: Viewer, clause: clause.Clause, options: LoadEntOptions<T>): Promise<Map<ID, T>>;
 export declare function loadCustomEnts<T extends Ent>(viewer: Viewer, options: LoadCustomEntOptions<T>, query: CustomQuery): Promise<T[]>;
 interface rawQueryOptions {

package/core/ent.js

@@ -22,7 +22,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.applyPrivacyPolicyForRowX = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = 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.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = void 0;
+exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRowX = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = 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.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = 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 = void 0;
+exports.getEdgeTypeInGroup = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -145,7 +146,7 @@ async function loadEntXFromClause(viewer, options, clause) {
 exports.loadEntXFromClause = loadEntXFromClause;
 async function loadEnts(viewer, options, ...ids) {
     if (!ids.length) {
-        return [];
+        return new Map();
     }
     let loaded = false;
     let rows = [];
@@ -175,12 +176,16 @@ async function loadEnts(viewer, options, ...ids) {
         // this is always "id" if not using an ObjectLoaderFactory
         clause.In("id", ...ids), options);
     }
+    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
-    // we need to get the result and re-sort... because the raw db access doesn't guarantee it in same order
-    // apparently
-    //  let m = await loadEntsFromClause(viewer, clause.In("id", ...ids), options);
-    let result = [];
+}
+exports.loadEnts = loadEnts;
+// calls loadEnts and returns the results sorted in the order they were passed in
+// useful for EntQuery and other paths where the order matters
+async function loadEntsList(viewer, options, ...ids) {
+    const m = await loadEnts(viewer, options, ...ids);
+    const result = [];
     ids.forEach((id) => {
         let ent = m.get(id);
         if (ent) {
@@ -189,7 +194,7 @@ async function loadEnts(viewer, options, ...ids) {
     });
     return result;
 }
-exports.loadEnts = loadEnts;
+exports.loadEntsList = loadEntsList;
 // we return a map here so that any sorting for queries that exist
 // can be done in O(N) time
 async function loadEntsFromClause(viewer, clause, options) {
@@ -1133,7 +1138,7 @@ async function loadNodesByEdge(viewer, id1, edgeType, options) {
     });
     // extract id2s
     const ids = rows.map((row) => row.id2);
-    return loadEnts(viewer, options, ...ids);
+    return loadEntsList(viewer, options, ...ids);
 }
 exports.loadNodesByEdge = loadNodesByEdge;
 async function applyPrivacyPolicyForRow(viewer, options, row) {

package/core/privacy.js

@@ -464,9 +464,6 @@ async function applyPrivacyPolicyX(v, policy, ent, throwErr) {
             if (res.error) {
                 throw res.error;
             }
-            if (res.getError) {
-                throw res.getError(policy, rule, ent);
-            }
             if (throwErr) {
                 throw throwErr();
             }

package/core/query/assoc_query.js

@@ -73,7 +73,7 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
             }
             let promises = [];
             for (const [_, value] of m) {
-                promises.push((0, ent_1.loadEnts)(this.viewer, value.options, ...value.ids));
+                promises.push((0, ent_1.loadEntsList)(this.viewer, value.options, ...value.ids));
             }
             const entss = await Promise.all(promises);
             const r = [];
@@ -83,7 +83,7 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
             return r;
         }
         const ids = edges.map((edge) => edge.id2);
-        return await (0, ent_1.loadEnts)(this.viewer, this.options, ...ids);
+        return (0, ent_1.loadEntsList)(this.viewer, this.options, ...ids);
     }
     dataToID(edge) {
         return edge.id2;

package/core/query/query.d.ts

@@ -41,7 +41,7 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     private idMap;
     private idsToFetch;
     constructor(viewer: Viewer, sortCol: string);
-    getPrivacyPolicy(): PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<Ent>;
     abstract sourceEnt(id: ID): Promise<Ent | null>;
     first(n: number, after?: string): this;
     last(n: number, before?: string): this;

package/imports/index.d.ts

@@ -11,7 +11,6 @@ interface classResult {
     file: file;
 }
 export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
-export declare function findTSConfigFile(filePath: string): string | null;
 export interface importInfo {
     name: string;
     importPath: string;

package/imports/index.js

@@ -22,12 +22,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTSConfigFile = exports.parseCustomImports = void 0;
+exports.parseCustomImports = void 0;
 const glob_1 = __importDefault(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
-const json5_1 = __importDefault(require("json5"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const compilerOptions_1 = require("../tsc/compilerOptions");
 function getFiles(filePath, opts) {
     if (!path.isAbsolute(filePath)) {
         throw new Error("absolute file path required");
@@ -44,7 +44,7 @@ function getFiles(filePath, opts) {
 }
 function parseCustomImports(filePath, opts) {
     const files = getFiles(filePath, opts);
-    const options = readCompilerOptions(filePath);
+    const options = (0, compilerOptions_1.readCompilerOptions)(filePath);
     let classMap = new Map();
     files.forEach((file) => {
         const sourceFile = typescript_1.default.createSourceFile(file, fs.readFileSync(file).toString(), options.target || typescript_1.default.ScriptTarget.ES2015);
@@ -77,39 +77,6 @@ function parseCustomImports(filePath, opts) {
     };
 }
 exports.parseCustomImports = parseCustomImports;
-function findTSConfigFile(filePath) {
-    while (filePath != "/") {
-        let configPath = `${filePath}/tsconfig.json`;
-        if (fs.existsSync(configPath)) {
-            return configPath;
-        }
-        filePath = path.join(filePath, "..");
-    }
-    return null;
-}
-exports.findTSConfigFile = findTSConfigFile;
-// inspiration taken from compiler.ts
-function readCompilerOptions(filePath) {
-    let configPath = findTSConfigFile(filePath);
-    if (!configPath) {
-        return {};
-    }
-    let json = {};
-    try {
-        json = json5_1.default.parse(fs.readFileSync(configPath, {
-            encoding: "utf8",
-        }));
-    }
-    catch (e) {
-        console.error("couldn't read tsconfig.json file");
-        return {};
-    }
-    let options = json["compilerOptions"] || {};
-    if (options.moduleResolution === "node") {
-        options.moduleResolution = typescript_1.default.ModuleResolutionKind.NodeJs;
-    }
-    return options;
-}
 function traverse(sourceFile, f, classMap) {
     typescript_1.default.forEachChild(sourceFile, function (node) {
         switch (node.kind) {

package/package.json

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

package/parse_schema/parse.d.ts

@@ -1,4 +1,4 @@
-import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
+import { Schema, Field, AssocEdge, AssocEdgeGroup, Action, Type } from "../schema";
 import { ActionField } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
@@ -32,10 +32,18 @@ interface ProcessedPattern {
     assocEdges: ProcessedAssocEdge[];
     fields: ProcessedField[];
 }
-declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate"> & {
+declare type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
+    subFields?: ProcessedField[];
+    listElemType?: ProcessedType;
+    unionFields?: ProcessedField[];
+};
+declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "type"> & {
+    name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;
     patternName?: string;
+    derivedFields?: ProcessedField[];
+    type: ProcessedType;
 };
 interface patternsDict {
     [key: string]: ProcessedPattern;

package/parse_schema/parse.js

@@ -3,8 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSchema = void 0;
 function processFields(src, patternName) {
     const ret = [];
-    for (const field of src) {
-        let f = { ...field };
+    let m = {};
+    if (Array.isArray(src)) {
+        for (const field of src) {
+            const name = field.name;
+            if (!name) {
+                throw new Error(`name is required`);
+            }
+            m[name] = field;
+        }
+    }
+    else {
+        m = src;
+    }
+    for (const name in m) {
+        const field = m[name];
+        //@ts-ignore type and other changed fields with different type in ProcessedField vs Field
+        let f = { name, ...field };
         f.hasDefaultValueOnCreate = field.defaultValueOnCreate != undefined;
         f.hasDefaultValueOnEdit = field.defaultValueOnEdit != undefined;
         if (field.polymorphic) {
@@ -31,6 +46,21 @@ function processFields(src, patternName) {
         if (patternName) {
             f.patternName = patternName;
         }
+        if (field.getDerivedFields) {
+            f.derivedFields = processFields(field.getDerivedFields(name));
+        }
+        if (field.type.subFields) {
+            f.type.subFields = processFields(field.type.subFields);
+        }
+        if (field.type.unionFields) {
+            f.type.unionFields = processFields(field.type.unionFields);
+        }
+        if (field.type.listElemType &&
+            field.type.listElemType.subFields &&
+            // check to avoid ts-ignore below. exists just for tsc
+            f.type.listElemType) {
+            f.type.listElemType.subFields = processFields(field.type.listElemType.subFields);
+        }
         ret.push(f);
     }
     return ret;

package/schema/base_schema.js

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEntSchemaWithTZ = exports.BaseEntSchema = exports.Node = exports.Timestamps = void 0;
 const uuid_1 = require("uuid");
 const field_1 = require("./field");
-let tsFields = [
-    (0, field_1.TimestampType)({
-        name: "createdAt",
+let tsFields = {
+    createdAt: (0, field_1.TimestampType)({
         hideFromGraphQL: true,
         disableUserEditable: true,
         defaultValueOnCreate: () => {
             return new Date();
         },
     }),
-    (0, field_1.TimestampType)({
-        name: "updatedAt",
+    updatedAt: (0, field_1.TimestampType)({
         hideFromGraphQL: true,
         disableUserEditable: true,
         defaultValueOnCreate: () => {
@@ -23,25 +21,28 @@ let tsFields = [
             return new Date();
         },
     }),
-];
+};
 // Timestamps is a Pattern that adds a createdAt and updatedAt timestamp fields to the ent
 exports.Timestamps = {
     name: "timestamps",
     fields: tsFields,
 };
 let nodeField = (0, field_1.UUIDType)({
-    name: "ID",
     primaryKey: true,
     disableUserEditable: true,
     defaultValueOnCreate: () => {
         return (0, uuid_1.v4)();
     },
 });
-let nodeFields = [nodeField, ...tsFields];
-let nodeFieldsWithTZ = [
-    nodeField,
-    (0, field_1.TimestampType)({
-        name: "createdAt",
+let nodeFields = {
+    // inconsistent naming :(
+    ID: nodeField,
+    ...tsFields,
+};
+let nodeFieldsWithTZ = {
+    // inconsistent naming :(
+    ID: nodeField,
+    createdAt: (0, field_1.TimestampType)({
         hideFromGraphQL: true,
         disableUserEditable: true,
         defaultValueOnCreate: () => {
@@ -49,8 +50,7 @@ let nodeFieldsWithTZ = [
         },
         withTimezone: true,
     }),
-    (0, field_1.TimestampType)({
-        name: "updatedAt",
+    updatedAt: (0, field_1.TimestampType)({
         hideFromGraphQL: true,
         disableUserEditable: true,
         defaultValueOnCreate: () => {
@@ -61,7 +61,7 @@ let nodeFieldsWithTZ = [
         },
         withTimezone: true,
     }),
-];
+};
 // Node is a Pattern that adds 3 fields to the ent: (id, createdAt, and updatedAt timestamps)
 exports.Node = {
     name: "node",