@snowtop/ent 0.1.14-test3 → 0.1.15

package/action/orchestrator.d.ts

@@ -27,8 +27,8 @@ interface edgeInputDataOpts<TEnt extends Ent<TViewer>, TViewer extends Viewer =
     nodeType?: string;
     options?: AssocEdgeInputOptions;
 }
-export interface EdgeInputData<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer> extends edgeInputDataOpts<TEnt, TViewer> {
-    isBuilder(id: Builder<TEnt, TViewer> | ID): id is Builder<TEnt, TViewer>;
+export interface EdgeInputData<TViewer extends Viewer = Viewer> extends edgeInputDataOpts<any, TViewer> {
+    isBuilder(id: Builder<any, TViewer> | ID): id is Builder<any, TViewer>;
 }
 export declare enum edgeDirection {
     inboundEdge = 0,
@@ -62,7 +62,7 @@ export declare class Orchestrator<TEnt extends Ent<TViewer>, TInput extends Data
     addOutboundEdge<T2 extends Ent>(id2: ID | Builder<T2, any>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
     removeInboundEdge(id1: ID, edgeType: string, options?: AssocEdgeOptions): void;
     removeOutboundEdge(id2: ID, edgeType: string, options?: AssocEdgeOptions): void;
-    getInputEdges(edgeType: string, op: WriteOperation): EdgeInputData<any, TViewer>[];
+    getInputEdges(edgeType: string, op: WriteOperation): EdgeInputData<TViewer>[];
     clearInputEdges(edgeType: string, op: WriteOperation, id?: ID): void;
     private buildMainOp;
     private getEdgeOperation;

package/core/convert.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 export declare function convertDate(val: any): Date;
 export declare function convertNullableDate(val: any): Date | null;
 export declare function convertBool(val: any): boolean;
@@ -12,3 +13,5 @@ export declare function convertJSON(val: any): any;
 export declare function convertNullableJSON(val: any): any | null;
 export declare function convertJSONList(val: any): any[];
 export declare function convertNullableJSONList(val: any): any[] | null;
+export declare function convertTextToBuffer(val: any): Buffer;
+export declare function convertNullableTextToBuffer(val: any): Buffer;

package/core/convert.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertNullableJSONList = exports.convertJSONList = exports.convertNullableJSON = exports.convertJSON = exports.convertNullableBoolList = exports.convertBoolList = exports.convertNullableDateList = exports.convertDateList = exports.convertNullableList = exports.convertList = exports.convertNullableBool = exports.convertBool = exports.convertNullableDate = exports.convertDate = void 0;
+exports.convertNullableTextToBuffer = exports.convertTextToBuffer = exports.convertNullableJSONList = exports.convertJSONList = exports.convertNullableJSON = exports.convertJSON = exports.convertNullableBoolList = exports.convertBoolList = exports.convertNullableDateList = exports.convertDateList = exports.convertNullableList = exports.convertList = exports.convertNullableBool = exports.convertBool = exports.convertNullableDate = exports.convertDate = void 0;
 const luxon_1 = require("luxon");
 // these are needed to deal with SQLite having different types stored in the db vs the representation
 // gotten back from the db/needed in ent land
@@ -104,3 +104,17 @@ function convertNullableJSONList(val) {
     return convertNullableList(val, convertJSON);
 }
 exports.convertNullableJSONList = convertNullableJSONList;
+function convertTextToBuffer(val) {
+    if (typeof val === "string") {
+        return Buffer.from(val, "base64");
+    }
+    return val;
+}
+exports.convertTextToBuffer = convertTextToBuffer;
+function convertNullableTextToBuffer(val) {
+    if (val == null) {
+        return val;
+    }
+    return convertTextToBuffer(val);
+}
+exports.convertNullableTextToBuffer = convertNullableTextToBuffer;

package/package.json

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

package/schema/binary_field.d.ts

@@ -0,0 +1,14 @@
+import { BaseField } from "./field";
+import { Type, Field, FieldOptions } from "./schema";
+export declare class ByteaField extends BaseField implements Field {
+    type: Type;
+    format(val: any): any;
+    valid(val: any): boolean;
+}
+export declare function ByteaType(options?: FieldOptions): ByteaField & FieldOptions;
+export declare class BinaryTextField extends BaseField implements Field {
+    type: Type;
+    format(val: any): any;
+    valid(val: any): boolean;
+}
+export declare function BinaryTextType(options?: FieldOptions): BinaryTextField & FieldOptions;

package/schema/binary_field.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BinaryTextType = exports.BinaryTextField = exports.ByteaType = exports.ByteaField = void 0;
+const field_1 = require("./field");
+const schema_1 = require("./schema");
+class ByteaField extends field_1.BaseField {
+    constructor() {
+        super(...arguments);
+        this.type = {
+            dbType: schema_1.DBType.Bytea,
+        };
+    }
+    format(val) {
+        return val;
+    }
+    valid(val) {
+        return val instanceof Buffer;
+    }
+}
+exports.ByteaField = ByteaField;
+/*
+ * NB: using this field requires the developer to run `npm i graphql-scalars` for the correct
+ * graphql types to be available.
+ */
+function ByteaType(options) {
+    const result = new ByteaField();
+    return Object.assign(result, options);
+}
+exports.ByteaType = ByteaType;
+class BinaryTextField extends field_1.BaseField {
+    constructor() {
+        super(...arguments);
+        this.type = {
+            dbType: schema_1.DBType.StringByte,
+        };
+    }
+    format(val) {
+        return val.toString("base64");
+    }
+    valid(val) {
+        return val instanceof Buffer;
+    }
+}
+exports.BinaryTextField = BinaryTextField;
+/*
+ * NB: using this field requires the developer to run `npm i graphql-scalars` for the correct
+ * graphql types to be available.
+ */
+function BinaryTextType(options) {
+    const result = new BinaryTextField();
+    return Object.assign(result, options);
+}
+exports.BinaryTextType = BinaryTextType;

package/schema/index.d.ts

@@ -6,3 +6,4 @@ export * from "./field";
 export * from "./json_field";
 export * from "./struct_field";
 export * from "./union_field";
+export * from "./binary_field";

package/schema/index.js

@@ -40,3 +40,4 @@ __exportStar(require("./field"), exports);
 __exportStar(require("./json_field"), exports);
 __exportStar(require("./struct_field"), exports);
 __exportStar(require("./union_field"), exports);
+__exportStar(require("./binary_field"), exports);

package/schema/schema.d.ts

@@ -153,6 +153,8 @@ export declare enum DBType {
     Date = "Date",
     Time = "Time",
     Timetz = "Timetz",
+    Bytea = "Bytea",
+    StringByte = "StringByte",
     List = "List"
 }
 export interface DeprecatedImportType {

package/schema/schema.js

@@ -39,6 +39,8 @@ var DBType;
     DBType["Date"] = "Date";
     DBType["Time"] = "Time";
     DBType["Timetz"] = "Timetz";
+    DBType["Bytea"] = "Bytea";
+    DBType["StringByte"] = "StringByte";
     DBType["List"] = "List";
 })(DBType = exports.DBType || (exports.DBType = {}));
 function isSchema(value) {

package/scripts/custom_graphql.js

@@ -363,6 +363,10 @@ async function main() {
         importPath: "graphql-type-json",
         type: "GraphQLJSON",
     }, gqlCapture);
+    (0, graphql_1.addCustomType)({
+        importPath: "graphql-scalars",
+        type: "GraphQLByte",
+    }, gqlCapture);
     const [inputsRead, _, __, imports] = await Promise.all([
         readInputs(),
         captureCustom(options.path, options.files, options.json_path, gqlCapture),

package/testutils/action/complex_schemas.d.ts

@@ -45,7 +45,7 @@ export declare class UserAction extends SimpleAction<User> {
     getTriggers(): Trigger<User, SimpleBuilder<User>>[];
     getObservers(): Observer<User, SimpleBuilder<User>>[];
 }
-type getMembershipFunction = (viewer: Viewer, edge: EdgeInputData<Ent, Viewer>) => SimpleAction<Ent>;
+type getMembershipFunction = (viewer: Viewer, edge: EdgeInputData<Viewer>) => SimpleAction<Ent>;
 export declare class GroupMembershipTrigger implements Trigger<Group, SimpleBuilder<Group>> {
     private getter;
     constructor(getter: getMembershipFunction);

package/testutils/db/temp_db.d.ts

@@ -62,6 +62,7 @@ export declare function integer(name: string, opts?: options): Column;
 export declare function float(name: string, opts?: options): Column;
 export declare function json(name: string, opts?: options): Column;
 export declare function jsonb(name: string, opts?: options): Column;
+export declare function bytea(name: string, opts?: options): Column;
 export declare function textList(name: string, opts?: options): Column;
 export declare function integerList(name: string, opts?: options): Column;
 export declare function uuidList(name: string, opts?: options): Column;

package/testutils/db/temp_db.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumnFromField = exports.getSchemaTable = exports.doSQLiteTestFromSchemas = exports.setupPostgres = exports.setupSqlite = exports.assoc_edge_table = exports.assoc_edge_config_table = exports.TempDB = exports.enumType = exports.table = exports.boolList = exports.dateList = exports.timetzList = exports.timeList = exports.timestamptzList = exports.timestampList = exports.uuidList = exports.integerList = exports.textList = exports.jsonb = exports.json = exports.float = exports.integer = exports.bool = exports.date = exports.timetz = exports.time = exports.timestamptz = exports.timestamp = exports.enumCol = exports.text = exports.uuid = exports.index = exports.check = exports.foreignKey = exports.primaryKey = void 0;
+exports.getColumnFromField = exports.getSchemaTable = exports.doSQLiteTestFromSchemas = exports.setupPostgres = exports.setupSqlite = exports.assoc_edge_table = exports.assoc_edge_config_table = exports.TempDB = exports.enumType = exports.table = exports.boolList = exports.dateList = exports.timetzList = exports.timeList = exports.timestamptzList = exports.timestampList = exports.uuidList = exports.integerList = exports.textList = exports.bytea = exports.jsonb = exports.json = exports.float = exports.integer = exports.bool = exports.date = exports.timetz = exports.time = exports.timestamptz = exports.timestamp = exports.enumCol = exports.text = exports.uuid = exports.index = exports.check = exports.foreignKey = exports.primaryKey = void 0;
 const pg_1 = require("pg");
 const db_1 = __importStar(require("../../core/db"));
 // this should only be used in tests so we expect to be able to import without shenanigans
@@ -239,6 +239,16 @@ function jsonb(name, opts) {
     };
 }
 exports.jsonb = jsonb;
+function bytea(name, opts) {
+    return {
+        name,
+        datatype() {
+            return "BYTEA";
+        },
+        ...opts,
+    };
+}
+exports.bytea = bytea;
 function list(name, col, opts) {
     return {
         name,
@@ -724,6 +734,10 @@ function getColumnForDbType(t, dialect) {
             return jsonb;
         case schema_1.DBType.JSON:
             return json;
+        case schema_1.DBType.StringByte:
+            return text;
+        case schema_1.DBType.Bytea:
+            return bytea;
         default:
             return undefined;
     }