@snowtop/ent 0.1.0-alpha111 → 0.1.0-alpha113

package/action/orchestrator.js

@@ -35,6 +35,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");
 var edgeDirection;
 (function (edgeDirection) {
     edgeDirection[edgeDirection["inboundEdge"] = 0] = "inboundEdge";
@@ -272,12 +273,32 @@ class Orchestrator {
         }
         return new EntCannotDeleteEntError(privacyPolicy, action, this.existingEnt);
     }
-    getEntForPrivacyPolicyImpl(editedData) {
+    async getEntForPrivacyPolicyImpl(schemaFields, editedData) {
         if (this.actualOperation !== action_1.WriteOperation.Insert) {
             return this.existingEnt;
         }
+        // need to format fields if possible because ent constructors expect data that's
+        // in the format that's coming from the db
+        // required for object fields...
+        const formatted = { ...editedData };
+        for (const [fieldName, field] of schemaFields) {
+            if (!field.format) {
+                continue;
+            }
+            let dbKey = this.getStorageKey(fieldName);
+            let val = formatted[dbKey];
+            if (!val) {
+                continue;
+            }
+            // nested so it's not JSON stringified or anything like that
+            val = field.format(formatted[dbKey], true);
+            if (util_1.types.isPromise(val)) {
+                val = await val;
+            }
+            formatted[dbKey] = val;
+        }
         // we create an unsafe ent to be used for privacy policies
-        return new this.options.builder.ent(this.options.builder.viewer, editedData);
+        return new this.options.builder.ent(this.options.builder.viewer, formatted);
     }
     getSQLStatementOperation() {
         switch (this.actualOperation) {
@@ -307,8 +328,8 @@ class Orchestrator {
         if (this.actualOperation !== action_1.WriteOperation.Insert) {
             return this.existingEnt;
         }
-        const { editedData } = await this.memoizedGetFields();
-        return this.getEntForPrivacyPolicyImpl(editedData);
+        const { schemaFields, editedData } = await this.memoizedGetFields();
+        return this.getEntForPrivacyPolicyImpl(schemaFields, editedData);
     }
     // this gets the fields that were explicitly set plus any default or transformed values
     // mainly exists to get default fields e.g. default id to be used in triggers
@@ -359,7 +380,7 @@ class Orchestrator {
         let privacyError = null;
         if (privacyPolicy) {
             try {
-                await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, this.getEntForPrivacyPolicyImpl(editedData), this.throwError.bind(this));
+                await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, await this.getEntForPrivacyPolicyImpl(schemaFields, editedData), this.throwError.bind(this));
             }
             catch (err) {
                 privacyError = err;
@@ -536,11 +557,17 @@ class Orchestrator {
                         if (defaultValue === undefined) {
                             throw new Error(`defaultValueOnCreate() returned undefined for field ${fieldName}`);
                         }
+                        if (util_1.types.isPromise(defaultValue)) {
+                            defaultValue = await defaultValue;
+                        }
                     }
                 }
                 if (field.defaultValueOnEdit &&
                     this.actualOperation === action_1.WriteOperation.Edit) {
                     defaultValue = field.defaultValueOnEdit(builder, input);
+                    if (util_1.types.isPromise(defaultValue)) {
+                        defaultValue = await defaultValue;
+                    }
                 }
             }
             if (value !== undefined) {

package/core/const.d.ts

@@ -0,0 +1,3 @@
+export declare const PACKAGE = "@snowtop/ent";
+export declare const GRAPHQL_PATH = "@snowtop/ent/graphql";
+export declare const SCHEMA_PATH = "@snowtop/ent/schema";

package/core/const.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SCHEMA_PATH = exports.GRAPHQL_PATH = exports.PACKAGE = void 0;
+exports.PACKAGE = "@snowtop/ent";
+exports.GRAPHQL_PATH = "@snowtop/ent/graphql";
+exports.SCHEMA_PATH = "@snowtop/ent/schema";

package/package.json

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

package/parse_schema/parse.d.ts

@@ -1,5 +1,5 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type, GlobalSchema } from "../schema/schema";
+import { ActionField, Type, GlobalSchema, TransformReadBetaResult } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
@@ -15,6 +15,7 @@ type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActions"> &
 interface TransformFlags {
     transformsSelect?: boolean;
     transformsDelete?: boolean;
+    transformsLoaderCodegen?: TransformReadBetaResult;
     transformsInsert?: boolean;
     transformsUpdate?: boolean;
 }

package/parse_schema/parse.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSchema = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
+const const_1 = require("../core/const");
 async function processFields(src, patternName) {
     const ret = [];
     let m = {};
@@ -158,6 +159,23 @@ async function processPattern(patterns, pattern, processedSchema) {
     // flag transformsSelect
     if (pattern.transformRead) {
         ret.transformsSelect = true;
+        if (pattern.transformReadCodegen_BETA) {
+            const r = pattern.transformReadCodegen_BETA();
+            if (typeof r === "string") {
+                ret.transformsLoaderCodegen = {
+                    code: r,
+                    imports: [
+                        {
+                            importPath: const_1.PACKAGE,
+                            import: "query",
+                        },
+                    ],
+                };
+            }
+            else {
+                ret.transformsLoaderCodegen = r;
+            }
+        }
     }
     if (patterns[name] === undefined) {
         // intentionally processing separately and not passing pattern.name
@@ -258,6 +276,10 @@ async function parseSchema(potentialSchemas, globalSchema) {
                         throw new Error(`can only have one pattern which transforms default querying behavior`);
                     }
                     processedSchema.transformsSelect = true;
+                    if (ret.transformsLoaderCodegen) {
+                        processedSchema.transformsLoaderCodegen =
+                            ret.transformsLoaderCodegen;
+                    }
                 }
                 if (ret.transformsDelete) {
                     if (processedSchema.transformsDelete) {

package/schema/json_field.d.ts

@@ -1,8 +1,8 @@
-import { FieldOptions, Type, Field, ImportType } from "./schema";
+import { FieldOptions, Type, Field, DeprecatedImportType } from "./schema";
 import { BaseField, ListField } from "./field";
 export interface JSONOptions extends FieldOptions {
     validator?: (val: any) => boolean;
-    importType?: ImportType;
+    importType?: DeprecatedImportType;
 }
 interface allJSONOptions extends JSONOptions {
     jsonAsList?: boolean;

package/schema/schema.d.ts

@@ -79,12 +79,23 @@ export interface AssocEdgeGroup {
     edgeAction?: EdgeGroupAction;
 }
 export type Edge = AssocEdge;
+interface ImportPath {
+    importPath: string;
+    import: string;
+    defaultImport?: boolean;
+    originalImport?: string;
+}
+export interface TransformReadBetaResult {
+    code: string;
+    imports: ImportPath[];
+}
 export interface Pattern {
     name: string;
     fields: FieldMap;
     disableMixin?: boolean;
     edges?: Edge[];
     transformRead?: () => Clause;
+    transformReadCodegen_BETA?: () => string | TransformReadBetaResult;
     transformWrite?: <T extends Ent<TViewer>, TViewer extends Viewer = Viewer>(stmt: UpdateOperation<T, TViewer>) => TransformedUpdateOperation<T, TViewer> | null;
     transformsDelete?: boolean;
     transformsInsert?: boolean;
@@ -135,7 +146,7 @@ export declare enum DBType {
     Timetz = "Timetz",
     List = "List"
 }
-export interface ImportType {
+export interface DeprecatedImportType {
     path: string;
     type: string;
     [x: string]: any;
@@ -160,7 +171,7 @@ export interface Type {
     intEnumMap?: IntEnumMap;
     deprecatedIntEnumMap?: IntEnumMap;
     disableUnknownType?: boolean;
-    importType?: ImportType;
+    importType?: DeprecatedImportType;
     subFields?: FieldMap;
     unionFields?: FieldMap;
     [x: string]: any;

package/scripts/custom_graphql.js

@@ -37,10 +37,11 @@ const readline = __importStar(require("readline"));
 const imports_1 = require("../imports");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
+const const_1 = require("../core/const");
 // need to use the GQLCapture from the package so that when we call GQLCapture.enable()
 // we're affecting the local paths as opposed to a different instance
 // life is hard
-const MODULE_PATH = "@snowtop/ent/graphql";
+const MODULE_PATH = const_1.GRAPHQL_PATH;
 async function readInputs() {
     return await new Promise((resolve) => {
         const rl = readline.createInterface({

package/tsc/ast.js

@@ -31,6 +31,7 @@ const typescript_1 = __importDefault(require("typescript"));
 const path = __importStar(require("path"));
 const js_yaml_1 = require("js-yaml");
 const fs = __importStar(require("fs"));
+const const_1 = require("../core/const");
 function getPreText(fileContents, node, sourceFile) {
     return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
 }
@@ -267,7 +268,7 @@ function getCustomInfo() {
     catch (e) { }
     return {
         viewerInfo: {
-            path: "@snowtop/ent",
+            path: const_1.PACKAGE,
             name: "Viewer",
         },
         relativeImports,

package/tsc/transform_ent.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransformEnt = void 0;
+const const_1 = require("../core/const");
 const typescript_1 = __importDefault(require("typescript"));
 const ast_1 = require("./ast");
 function isPrivacyPolicy(mm) {
@@ -52,7 +53,7 @@ class TransformEnt {
         return {
             rawString: classInfo.wrapClassContents(klassContents),
             traversed,
-            imports: new Map([["@snowtop/ent", ["PrivacyPolicy"]]]),
+            imports: new Map([[const_1.PACKAGE, ["PrivacyPolicy"]]]),
         };
     }
 }

package/tsc/transform_schema.js

@@ -31,6 +31,7 @@ const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const ast_1 = require("../tsc/ast");
+const const_1 = require("../core/const");
 function traverseClass(fileContents, sourceFile, node, transformSchema) {
     const ci = getTransformClassInfo(fileContents, sourceFile, node, transformSchema);
     if (!ci) {
@@ -307,9 +308,9 @@ function parseFieldElement(element, sourceFile, fileContents, nested) {
 // find which of these importPaths is being used and use that to replace
 function findSchemaImportPath(sourceFile) {
     const paths = {
-        "@snowtop/ent": true,
-        "@snowtop/ent/schema": true,
-        "@snowtop/ent/schema/": true,
+        [const_1.PACKAGE]: true,
+        [const_1.SCHEMA_PATH]: true,
+        [`${const_1.SCHEMA_PATH}/`]: true,
     };
     // @ts-ignore
     const importStatements = sourceFile.statements.filter((stmt) => typescript_1.default.isImportDeclaration(stmt));