@snowtop/ent 0.2.2 → 0.2.3-alpha1

package/core/db.js

@@ -205,6 +205,22 @@ exports.defaultTimestampParser = pg_1.default.types.getTypeParser(pg_1.default.t
 pg_1.default.types.setTypeParser(pg_1.default.types.builtins.TIMESTAMP, function (val) {
     return luxon_1.DateTime.fromSQL(val + "Z").toJSDate();
 });
+pg_1.default.types.setTypeParser(pg_1.default.types.builtins.DATE, function (val) {
+    return val;
+});
+// pg-types only exposes scalar OIDs, so we have to hard-code the array
+// OIDs we care about (DATE[] and TEXT[]). If these ever change upstream,
+// update the constants below.
+const TEXT_ARRAY_OID = 1009;
+const DATE_ARRAY_OID = 1182;
+// TEXT[] already parses to string[], so reuse that parser for DATE[]
+const parseTextArray = pg_1.default.types.getTypeParser(TEXT_ARRAY_OID);
+pg_1.default.types.setTypeParser(DATE_ARRAY_OID, function (val) {
+    if (val === null) {
+        return null;
+    }
+    return parseTextArray(val);
+});
 class Sqlite {
     constructor(db) {
         this.db = db;

package/graphql/index.d.ts

@@ -1,5 +1,6 @@
 export { gqlFieldOptions, gqlObjectOptions, gqlField, gqlArgType, gqlInputObjectType, gqlObjectType, gqlQuery, gqlMutation, gqlContextType, gqlConnection, GraphQLConnection, GQLCapture, gqlFileUpload, CustomType, gqlInterfaceType, gqlUnionType, } from "./graphql";
 export { GraphQLTime } from "./scalars/time";
+export { GraphQLDate } from "./scalars/date";
 export { GraphQLOrderByDirection } from "./scalars/orderby_direction";
 export { GraphQLPageInfo } from "./query/page_info";
 export { GraphQLEdge, GraphQLEdgeConnection } from "./query/edge_connection";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformUnionTypes = 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.GraphQLOrderByDirection = exports.GraphQLTime = exports.gqlUnionType = exports.gqlInterfaceType = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlField = void 0;
+exports.transformUnionTypes = 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.GraphQLOrderByDirection = exports.GraphQLDate = exports.GraphQLTime = exports.gqlUnionType = exports.gqlInterfaceType = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlField = void 0;
 var graphql_1 = require("./graphql");
 Object.defineProperty(exports, "gqlField", { enumerable: true, get: function () { return graphql_1.gqlField; } });
 Object.defineProperty(exports, "gqlArgType", { enumerable: true, get: function () { return graphql_1.gqlArgType; } });
@@ -16,6 +16,8 @@ Object.defineProperty(exports, "gqlInterfaceType", { enumerable: true, get: func
 Object.defineProperty(exports, "gqlUnionType", { enumerable: true, get: function () { return graphql_1.gqlUnionType; } });
 var time_1 = require("./scalars/time");
 Object.defineProperty(exports, "GraphQLTime", { enumerable: true, get: function () { return time_1.GraphQLTime; } });
+var date_1 = require("./scalars/date");
+Object.defineProperty(exports, "GraphQLDate", { enumerable: true, get: function () { return date_1.GraphQLDate; } });
 var orderby_direction_1 = require("./scalars/orderby_direction");
 Object.defineProperty(exports, "GraphQLOrderByDirection", { enumerable: true, get: function () { return orderby_direction_1.GraphQLOrderByDirection; } });
 var page_info_1 = require("./query/page_info");

package/graphql/scalars/date.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from "graphql";
+export declare const GraphQLDate: GraphQLScalarType<string, string>;

package/graphql/scalars/date.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLDate = void 0;
+const graphql_1 = require("graphql");
+const language_1 = require("graphql/language");
+const luxon_1 = require("luxon");
+const DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
+function normalizeDate(input, throwErr) {
+    if (typeof input === "string") {
+        if (!DATE_REGEX.test(input)) {
+            throw throwErr(`Date must be in YYYY-MM-DD format: ${input}`);
+        }
+        const dt = luxon_1.DateTime.fromISO(input, { zone: "UTC" });
+        if (!dt.isValid) {
+            throw throwErr(`Invalid Date value ${input}`);
+        }
+        return dt.toISODate();
+    }
+    if (input instanceof Date) {
+        return luxon_1.DateTime.fromJSDate(input).toISODate();
+    }
+    if (input instanceof luxon_1.DateTime) {
+        if (!input.isValid) {
+            throw throwErr(`Invalid Date value ${input.toISO()}`);
+        }
+        return input.toISODate();
+    }
+    throw throwErr(`Date cannot represent value: ${input}`);
+}
+exports.GraphQLDate = new graphql_1.GraphQLScalarType({
+    name: "Date",
+    description: "Date scalar type with format YYYY-MM-DD",
+    serialize(value) {
+        return normalizeDate(value, (msg) => new graphql_1.GraphQLError(msg));
+    },
+    parseValue(value) {
+        return normalizeDate(value, (msg) => new graphql_1.GraphQLError(msg));
+    },
+    parseLiteral(ast) {
+        if (ast.kind !== language_1.Kind.STRING) {
+            throw new graphql_1.GraphQLError(`Date cannot represent literal: ${ast.kind}`);
+        }
+        return normalizeDate(ast.value, (msg) => new graphql_1.GraphQLError(msg));
+    },
+});

package/package.json

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

package/schema/field.js

@@ -499,11 +499,13 @@ class DateField extends BaseField {
             return val;
         }
         val = new Date(val);
-        let yy = (0, exports.leftPad)(val.getFullYear());
+        // interpret as UTC to avoid timezone drift when the Date
+        // represents a midnight UTC value
+        let yy = (0, exports.leftPad)(val.getUTCFullYear());
         // lol this API
         // for some reason this is 0-index
-        let mm = (0, exports.leftPad)(val.getMonth() + 1);
-        let dd = (0, exports.leftPad)(val.getDate());
+        let mm = (0, exports.leftPad)(val.getUTCMonth() + 1);
+        let dd = (0, exports.leftPad)(val.getUTCDate());
         let ret = `${yy}-${mm}-${dd}`;
         return ret;
     }

package/scripts/custom_graphql.js

@@ -359,6 +359,11 @@ async function main() {
         secondaryImportPath: "../graphql/scalars/time",
         type: "GraphQLTime",
     }, gqlCapture);
+    (0, graphql_1.addCustomType)({
+        importPath: MODULE_PATH,
+        secondaryImportPath: "../graphql/scalars/date",
+        type: "GraphQLDate",
+    }, gqlCapture);
     (0, graphql_1.addCustomType)({
         importPath: "graphql-type-json",
         type: "GraphQLJSON",

package/testutils/db/value.js

@@ -4,6 +4,7 @@ exports.getDefaultValue = exports.randomPhoneNumber = exports.randomEmail = void
 const uuid_1 = require("uuid");
 const schema_1 = require("../../schema");
 const schema_2 = require("../../schema");
+const crypto_1 = require("crypto");
 function random() {
     return Math.random().toString(16).substring(2);
 }
@@ -13,7 +14,12 @@ function randomEmail(domain) {
 }
 exports.randomEmail = randomEmail;
 function randomPhoneNumber() {
-    return `+1${Math.random().toString(10).substring(2, 11)}`;
+    // generate 12 digits from random bytes so we can safely carve out a NANP number
+    const raw = (0, crypto_1.randomBytes)(5).readUIntBE(0, 5).toString().padStart(12, "0");
+    const first = (parseInt(raw[0], 10) % 8) + 2; // ensure 2-9 for NANP area codes
+    const areaCode = `${first}${raw[1]}${raw[2]}`;
+    const localNumber = raw.slice(3, 10);
+    return `+1${areaCode}${localNumber}`;
 }
 exports.randomPhoneNumber = randomPhoneNumber;
 function coinFlip() {