@snowtop/ent 0.1.0-alpha → 0.1.0-alpha6

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/graphql/index.d.ts

@@ -8,3 +8,4 @@ export { GraphQLConnectionInterface } from "./builtins/connection";
 export { GraphQLEdgeInterface } from "./builtins/edge";
 export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, mustDecodeNullableIDFromGQLID, encodeGQLID, } from "./node_resolver";
 export { convertFromGQLEnum, convertToGQLEnum } from "./enums";
+export { transformUnionTypes } from "./mutations/union";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
+exports.transformUnionTypes = exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
 var graphql_1 = require("./graphql");
 Object.defineProperty(exports, "gqlField", { enumerable: true, get: function () { return graphql_1.gqlField; } });
 Object.defineProperty(exports, "gqlArg", { enumerable: true, get: function () { return graphql_1.gqlArg; } });
@@ -40,3 +40,5 @@ Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function
 var enums_1 = require("./enums");
 Object.defineProperty(exports, "convertFromGQLEnum", { enumerable: true, get: function () { return enums_1.convertFromGQLEnum; } });
 Object.defineProperty(exports, "convertToGQLEnum", { enumerable: true, get: function () { return enums_1.convertToGQLEnum; } });
+var union_1 = require("./mutations/union");
+Object.defineProperty(exports, "transformUnionTypes", { enumerable: true, get: function () { return union_1.transformUnionTypes; } });

package/graphql/mutations/union.d.ts

@@ -0,0 +1,2 @@
+import { Data } from "../../core/base";
+export declare function transformUnionTypes<T extends Data>(input: T, pathsList: string[][]): T;

package/graphql/mutations/union.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformUnionTypes = void 0;
+// this transforms an input for union types from graphql format to TS format
+// in graphql, we represent it as UnionType =  {foo: FooType, bar: BarType, baz: BazType}
+// in TS, we repseent it as UnionType = FooType | BarType | BazType
+// this takes an input, paths to unions and transforms them as needed
+// only works on fields that are defined. depends on graphql to handle nullable/missing fields
+function transformUnionTypes(input, pathsList) {
+    for (const paths of pathsList) {
+        const lastPath = paths[paths.length - 1];
+        let last = input;
+        for (const path of paths) {
+            let curr = last[path];
+            if (curr === undefined) {
+                break;
+            }
+            if (path === lastPath) {
+                let count = 0;
+                let lastKey = undefined;
+                for (const k in curr) {
+                    count++;
+                    lastKey = k;
+                }
+                if (count != 1) {
+                    throw new Error(`can only only pass one key of union. passed ${count}`);
+                }
+                last[path] = curr[lastKey];
+            }
+            last = curr;
+        }
+    }
+    return input;
+}
+exports.transformUnionTypes = transformUnionTypes;

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.1.0-alpha",
+  "version": "0.1.0-alpha6",
   "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) {
@@ -17,6 +32,9 @@ function processFields(src, patternName) {
                 f.polymorphic = field.polymorphic;
             }
         }
+        else {
+            delete f.polymorphic;
+        }
         // convert string to object to make API consumed by go simple
         if (f.fieldEdge && f.fieldEdge.inverseEdge) {
             if (typeof f.fieldEdge.inverseEdge === "string") {
@@ -28,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;
@@ -91,6 +124,7 @@ function processAction(action) {
     let actionOnlyFields = action.actionOnlyFields.map((f) => {
         let f2 = f;
         if (!f.nullable) {
+            delete f2.nullable;
             return f2;
         }
         if (typeof f.nullable === "boolean") {

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",

package/schema/field.d.ts

@@ -1,4 +1,4 @@
-import { Field, FieldOptions, ForeignKey, PolymorphicOptions, Type } from "./schema";
+import { Field, FieldMap, FieldOptions, ForeignKey, PolymorphicOptions, Type } from "./schema";
 export declare abstract class BaseField {
     name: string;
     nullable?: boolean;
@@ -12,18 +12,18 @@ export declare abstract class BaseField {
     index?: boolean;
     foreignKey?: ForeignKey;
     polymorphic?: boolean | PolymorphicOptions;
-    derivedFields?: Field[];
     derivedWhenEmbedded?: boolean;
     logValue(val: any): any;
 }
 export declare class UUIDField extends BaseField implements Field {
-    private options;
+    private options?;
     type: Type;
-    constructor(options: FieldOptions);
+    constructor(options?: FieldOptions | undefined);
+    getDerivedFields(fieldName: string): FieldMap;
     private isBuilder;
     valid(val: any): Promise<boolean>;
 }
-export declare function UUIDType(options: FieldOptions): UUIDField;
+export declare function UUIDType(options?: FieldOptions): UUIDField;
 export interface IntegerOptions extends FieldOptions {
     min?: number;
     max?: number;
@@ -40,7 +40,7 @@ export declare class IntegerField extends BaseField implements Field {
     valid(val: any): boolean;
     validate(validator: (str: number) => boolean): this;
 }
-export declare function IntegerType(options: IntegerOptions): IntegerField;
+export declare function IntegerType(options?: IntegerOptions): IntegerField;
 export declare class BigIntegerField extends BaseField implements Field {
     type: Type;
 }
@@ -48,11 +48,11 @@ export declare function BigIntegerType(options: FieldOptions): BigIntegerField;
 export declare class FloatField extends BaseField implements Field {
     type: Type;
 }
-export declare function FloatType(options: FieldOptions): FloatField;
+export declare function FloatType(options?: FieldOptions): FloatField;
 export declare class BooleanField extends BaseField implements Field {
     type: Type;
 }
-export declare function BooleanType(options: FieldOptions): BooleanField;
+export declare function BooleanType(options?: FieldOptions): BooleanField;
 export interface StringOptions extends FieldOptions {
     minLen?: number;
     maxLen?: number;
@@ -88,7 +88,7 @@ export declare class StringField extends BaseField implements Field {
     trimLeft(): this;
     trimRight(): this;
 }
-export declare function StringType(options: StringOptions): StringField;
+export declare function StringType(options?: StringOptions): StringField;
 export interface TimestampOptions extends FieldOptions {
     withTimezone?: boolean;
 }
@@ -98,8 +98,8 @@ export declare class TimestampField extends BaseField implements Field {
     constructor(options: TimestampOptions);
     format(val: Date): any;
 }
-export declare function TimestampType(options: TimestampOptions): TimestampField;
-export declare function TimestamptzType(options: FieldOptions): TimestampField;
+export declare function TimestampType(options?: TimestampOptions): TimestampField;
+export declare function TimestamptzType(options?: FieldOptions): TimestampField;
 export interface TimeOptions extends FieldOptions {
     withTimezone?: boolean;
     precision?: number;
@@ -108,16 +108,16 @@ export declare const leftPad: (val: number) => string;
 export declare class TimeField extends BaseField implements Field {
     type: Type;
     withTimezone?: boolean;
-    constructor(options: TimeOptions);
+    constructor(options?: TimeOptions);
     format(val: any): any;
 }
-export declare function TimeType(options: TimeOptions): TimeField;
-export declare function TimetzType(options: FieldOptions): TimeField;
+export declare function TimeType(options?: TimeOptions): TimeField;
+export declare function TimetzType(options?: FieldOptions): TimeField;
 export declare class DateField extends BaseField implements Field {
     type: Type;
     format(val: any): any;
 }
-export declare function DateType(options: FieldOptions): DateField;
+export declare function DateType(options?: FieldOptions): DateField;
 declare type EnumMap = {
     [key: string]: string;
 };
@@ -142,27 +142,27 @@ export declare class ListField extends BaseField {
     private field;
     type: Type;
     private validators;
-    constructor(field: Field, options: FieldOptions);
+    constructor(field: Field, options?: FieldOptions);
     validate(validator: (val: any[]) => boolean): this;
     valid(val: any): Promise<boolean>;
     private postgresVal;
-    format(val: any): any;
+    format(val: any, nested?: boolean): any;
     minLen(l: number): this;
     maxLen(l: number): this;
     length(l: number): this;
     range(start: any, stop: any): this;
 }
-export declare function StringListType(options: StringOptions): ListField;
+export declare function StringListType(options?: StringOptions): ListField;
 export declare function IntListType(options: FieldOptions): ListField;
-export declare function IntegerListType(options: FieldOptions): ListField;
-export declare function FloatListType(options: FieldOptions): ListField;
+export declare function IntegerListType(options?: FieldOptions): ListField;
+export declare function FloatListType(options?: FieldOptions): ListField;
 export declare function BigIntegerListType(options: FieldOptions): ListField;
-export declare function BooleanListType(options: FieldOptions): ListField;
+export declare function BooleanListType(options?: FieldOptions): ListField;
 export declare function TimestampListType(options: TimestampOptions): ListField;
-export declare function TimestamptzListType(options: TimestampOptions): ListField;
-export declare function TimeListType(options: TimeOptions): ListField;
+export declare function TimestamptzListType(options?: TimestampOptions): ListField;
+export declare function TimeListType(options?: TimeOptions): ListField;
 export declare function TimetzListType(options: TimeOptions): ListField;
-export declare function DateListType(options: FieldOptions): ListField;
+export declare function DateListType(options?: FieldOptions): ListField;
 export declare function EnumListType(options: EnumOptions): ListField;
-export declare function UUIDListType(options: FieldOptions): ListField;
+export declare function UUIDListType(options?: FieldOptions): ListField;
 export {};