@snowtop/ent 0.1.27 → 0.2.0-alpha.10-test1

package/testutils/builder.js

@@ -10,12 +10,11 @@ const action_1 = require("../action");
 const schema_1 = require("../schema");
 const db_mock_1 = require("./db_mock");
 const pluralize_1 = __importDefault(require("pluralize"));
-const snake_case_1 = require("snake-case");
 const loaders_1 = require("../core/loaders");
 const convert_1 = require("../core/convert");
-const camel_case_1 = require("camel-case");
 const base_schema_1 = require("../schema/base_schema");
 const schema_2 = require("../schema/schema");
+const names_1 = require("../names/names");
 class BaseEnt {
     constructor(viewer, data) {
         this.viewer = viewer;
@@ -157,7 +156,7 @@ function getSchemaName(value) {
 }
 exports.getSchemaName = getSchemaName;
 function getTableName(value) {
-    return (0, pluralize_1.default)((0, snake_case_1.snakeCase)(value.ent.name)).toLowerCase();
+    return (0, pluralize_1.default)((0, names_1.toDBColumnOrTable)(value.ent.name)).toLowerCase();
 }
 exports.getTableName = getTableName;
 const getDbFields = (schema) => {
@@ -212,17 +211,17 @@ class SimpleBuilder {
         for (const [name, f] of schemaFields) {
             dbFields.push((0, schema_2.getStorageKey)(f, name));
         }
-        if (!schemaFields.has("id") && !schemaFields.has("ID")) {
+        if (!schemaFields.has("id")) {
             if (schemaFields.size !== 1) {
                 throw new Error(`no id field and multiple fields so can't deduce key. add an id field to schema`);
             }
             for (const [name, _] of fields) {
-                key = (0, snake_case_1.snakeCase)(name);
+                key = (0, names_1.toDBColumnOrTable)(name);
             }
         }
         this.ent = schema.ent;
         const tableName = getTableName(schema);
-        this.nodeType = (0, camel_case_1.camelCase)(schema.ent.name);
+        this.nodeType = (0, names_1.toFieldName)(schema.ent.name);
         const fieldInfo = getFieldInfo(schema);
         this.orchestrator = new orchestrator_1.Orchestrator({
             viewer: this.viewer,
@@ -270,9 +269,8 @@ class SimpleBuilder {
                 this.fields.set(k, input[k]);
             }
             else {
-                // related to #510. we do camelCase to pass fields in here but fields may be snakeCase and we want that to pass in tests
-                // we do camelCase in
-                const sc = (0, snake_case_1.snakeCase)(k);
+                // TODO: ola 2/18/2024. we may not need both anymore?
+                const sc = (0, names_1.toDBColumnOrTable)(k);
                 if (knownFields.has(sc)) {
                     this.fields.set(sc, input[k]);
                 }

package/testutils/db/temp_db.js

@@ -34,9 +34,9 @@ const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const config_1 = require("../../core/config");
 const fs = __importStar(require("fs"));
 const schema_1 = require("../../schema");
-const snake_case_1 = require("snake-case");
 const builder_1 = require("../builder");
 const test_edge_global_schema_1 = require("../test_edge_global_schema");
+const names_1 = require("../../names/names");
 function primaryKey(name, cols) {
     return {
         name: name,
@@ -790,7 +790,7 @@ function storageKey(fieldName, f) {
     if (f.storageKey) {
         return f.storageKey;
     }
-    return (0, snake_case_1.snakeCase)(fieldName);
+    return (0, names_1.toDBColumnOrTable)(fieldName);
 }
 function isSyncClient(client) {
     return client.execSync !== undefined;

package/testutils/db/value.d.ts

@@ -1,5 +1,6 @@
 import { Field, Schema } from "../../schema";
 export declare function randomEmail(domain?: string): string;
+export declare function randomPhoneNumber(): string;
 interface Info {
     schema: Schema;
 }

package/testutils/db/value.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultValue = exports.randomEmail = void 0;
+exports.getDefaultValue = exports.randomPhoneNumber = exports.randomEmail = void 0;
 const uuid_1 = require("uuid");
 const schema_1 = require("../../schema");
 const schema_2 = require("../../schema");
@@ -15,6 +15,7 @@ exports.randomEmail = randomEmail;
 function randomPhoneNumber() {
     return `+1${Math.random().toString(10).substring(2, 11)}`;
 }
+exports.randomPhoneNumber = randomPhoneNumber;
 function coinFlip() {
     return Math.floor(Math.random() * 10) >= 5;
 }

package/testutils/db_mock.d.ts

@@ -1,5 +1,5 @@
 import { Pool } from "pg";
-import { ID, Data } from "../core/base";
+import { Data, ID } from "../core/base";
 import { Clause } from "../core/clause";
 import { MockLogs } from "./mock_log";
 export interface queryOptions {

package/testutils/db_mock.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryRecorder = exports.queryType = void 0;
-const uuid_1 = require("uuid");
 const jest_mock_1 = require("jest-mock");
+const uuid_1 = require("uuid");
 const parse_sql_1 = require("./parse_sql");
 const eventEmitter = {
     on: jest.fn(),

package/testutils/ent-graphql-tests/index.d.ts

@@ -1,7 +1,7 @@
 import { Express, RequestHandler } from "express";
-import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
+import { Viewer } from "../../core/base";
 export type Option = [string, any] | [string, any, string];
 interface queryConfig {
     viewer?: Viewer;

package/testutils/ent-graphql-tests/index.js

@@ -30,12 +30,12 @@ exports.expectMutation = exports.expectQueryFromRoot = void 0;
 // NB: this is copied from ent-graphql-tests package until I have time to figure out how to share code here effectively
 // the circular dependencies btw this package and ent-graphql-tests seems to imply something needs to change
 const express_1 = __importDefault(require("express"));
-const graphql_helix_1 = require("graphql-helix");
+const fs = __importStar(require("fs"));
 const graphql_1 = require("graphql");
-const auth_1 = require("../../auth");
+const graphql_helix_1 = require("graphql-helix");
 const supertest_1 = __importDefault(require("supertest"));
-const fs = __importStar(require("fs"));
 const util_1 = require("util");
+const auth_1 = require("../../auth");
 function server(config) {
     const viewer = config.viewer;
     if (viewer) {
@@ -125,7 +125,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
     if (files.size) {
         let ret = test
             .post(config.graphQLPath || "/graphql")
-            .set(config.headers || {});
+            .set((config.headers || {}));
         ret.field("operations", JSON.stringify({
             query: query,
             variables: variables,
@@ -152,7 +152,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
             test,
             test
                 .post(config.graphQLPath || "/graphql")
-                .set(config.headers || {})
+                .set((config.headers || {}))
                 .send({
                 query: query,
                 variables: JSON.stringify(variables),

package/testutils/fake_data/fake_contact.js

@@ -130,7 +130,7 @@ exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
     lastName: (0, schema_1.StringType)(),
     emailAddress: (0, schema_1.StringType)(),
     userID: (0, schema_1.UUIDType)({
-        foreignKey: { schema: "User", column: "ID" },
+        foreignKey: { schema: "User", column: "id" },
     }),
 }, FakeContact);
 exports.FakeContactSchemaWithDeletedAt = (0, builder_1.getBuilderSchemaFromFields)({
@@ -138,7 +138,7 @@ exports.FakeContactSchemaWithDeletedAt = (0, builder_1.getBuilderSchemaFromField
     lastName: (0, schema_1.StringType)(),
     emailAddress: (0, schema_1.StringType)(),
     userID: (0, schema_1.UUIDType)({
-        foreignKey: { schema: "User", column: "ID" },
+        foreignKey: { schema: "User", column: "id" },
     }),
 }, FakeContact, {
     patterns: [new soft_delete_1.DeletedAtPattern()],

package/testutils/fake_data/fake_event.js

@@ -132,7 +132,7 @@ exports.FakeEventSchema = (0, builder_1.getBuilderSchemaFromFields)({
         nullable: true,
     }),
     userID: (0, schema_1.UUIDType)({
-        foreignKey: { schema: "User", column: "ID" },
+        foreignKey: { schema: "User", column: "id" },
     }),
 }, FakeEvent);
 function getEventBuilder(viewer, input) {

package/testutils/fake_data/test_helpers.js

@@ -4,7 +4,6 @@ exports.createAllEvents = exports.tempDBTables = exports.setupTempDB = exports.c
 const jest_date_mock_1 = require("jest-date-mock");
 const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
-const snake_case_1 = require("snake-case");
 const write_1 = require("../write");
 const temp_db_1 = require("../db/temp_db");
 const _1 = require(".");
@@ -15,6 +14,7 @@ const builder_1 = require("../builder");
 const action_1 = require("../../action");
 const fake_tag_1 = require("./fake_tag");
 const db_1 = require("../../core/db");
+const names_1 = require("../../names/names");
 function getContactInput(user, input) {
     return {
         firstName: "Jon",
@@ -190,7 +190,7 @@ async function createEdges() {
         await (0, write_1.createRowForTest)({
             tableName: "assoc_edge_config",
             fields: {
-                edge_table: (0, snake_case_1.snakeCase)(`${edge}_table`),
+                edge_table: (0, names_1.toDBColumnOrTable)(edge, "table"),
                 symmetric_edge: _1.SymmetricEdges.has(edge),
                 inverse_edge_type: _1.InverseEdges.get(edge) || null,
                 edge_type: edge,
@@ -206,7 +206,7 @@ async function createEdges() {
 exports.createEdges = createEdges;
 function edgeTableNames() {
     const edges = Object.values(_1.EdgeType);
-    return edges.map((edge) => (0, snake_case_1.snakeCase)(`${edge}_table`));
+    return edges.map((edge) => (0, names_1.toDBColumnOrTable)(edge, "table"));
 }
 exports.edgeTableNames = edgeTableNames;
 async function createTestEvent(user, input) {

package/testutils/fake_data/user_query.d.ts

@@ -1,11 +1,11 @@
 import { Data, Ent, ID, Viewer } from "../../core/base";
-import { CustomEdgeQueryBase } from "../../core/query/custom_query";
-import { AssocEdge } from "../../core/ent";
 import * as clause from "../../core/clause";
-import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
-import { FakeUser, FakeEvent, FakeContact, EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery } from "./internal";
-import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
+import { AssocEdge } from "../../core/ent";
 import { QueryLoaderFactory } from "../../core/loaders/query_loader";
+import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
+import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
+import { CustomEdgeQueryBase } from "../../core/query/custom_query";
+import { EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery, FakeContact, FakeEvent, FakeUser } from "./internal";
 export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, FakeContact, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToContactsQuery;

package/testutils/fake_data/user_query.js

@@ -24,21 +24,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQueryDeletedAtAsc = exports.UserToContactsFkeyQueryAsc = exports.UserToContactsFkeyQueryDeletedAt = exports.UserToContactsFkeyQuery = exports.UserToContactsFkeyQueryDeprecated = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
-const custom_query_1 = require("../../core/query/custom_query");
-const ent_1 = require("../../core/ent");
+const jest_date_mock_1 = require("jest-date-mock");
+const _1 = require(".");
 const clause = __importStar(require("../../core/clause"));
-const assoc_query_1 = require("../../core/query/assoc_query");
-const internal_1 = require("./internal");
-const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
+const ent_1 = require("../../core/ent");
 const assoc_count_loader_1 = require("../../core/loaders/assoc_count_loader");
 const assoc_edge_loader_1 = require("../../core/loaders/assoc_edge_loader");
-const fake_contact_1 = require("./fake_contact");
-const jest_date_mock_1 = require("jest-date-mock");
-const luxon_1 = require("luxon");
 const query_loader_1 = require("../../core/loaders/query_loader");
-const mock_date_1 = require("./../mock_date");
-const _1 = require(".");
+const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
 const privacy_1 = require("../../core/privacy");
+const assoc_query_1 = require("../../core/query/assoc_query");
+const custom_query_1 = require("../../core/query/custom_query");
+const mock_date_1 = require("./../mock_date");
+const fake_contact_1 = require("./fake_contact");
+const internal_1 = require("./internal");
 class UserToContactsQuery extends assoc_query_1.AssocEdgeQueryBase {
     constructor(viewer, src) {
         super(viewer, src, new assoc_count_loader_1.AssocEdgeCountLoaderFactory(internal_1.EdgeType.UserToContacts), new assoc_edge_loader_1.AssocEdgeLoaderFactory(internal_1.EdgeType.UserToContacts, ent_1.AssocEdge), internal_1.FakeContact.loaderOptions());
@@ -351,10 +350,8 @@ const getNextWeekClause = () => {
     (0, jest_date_mock_1.clear)();
     const start = mock_date_1.MockDate.getDate();
     // 7 days
-    const end = luxon_1.Interval.after(start, 86400 * 1000 * 7)
-        .end.toUTC()
-        .toISO();
-    return clause.And(clause.GreaterEq("start_time", start.toISOString()), clause.LessEq("start_time", end));
+    const end = new Date(start.getTime() + 86400 * 1000 * 7);
+    return clause.And(clause.GreaterEq("start_time", start.toISOString()), clause.LessEq("start_time", end.toISOString()));
 };
 exports.getNextWeekClause = getNextWeekClause;
 function getCompleteClause(id) {

package/testutils/soft_delete.js

@@ -33,8 +33,6 @@ class DeletedAtPattern {
     constructor() {
         this.name = "deleted_at";
         this.fields = {
-            // need this to be lowerCamelCase because we do this based on field name
-            // #510
             deletedAt: (0, field_1.TimestampType)({
                 nullable: true,
                 index: true,
@@ -95,8 +93,6 @@ class DeletedAtPatternWithExtraWrites {
     constructor() {
         this.name = "deleted_at";
         this.fields = {
-            // need this to be lowerCamelCase because we do this based on field name
-            // #510
             deletedAt: (0, field_1.TimestampType)({
                 nullable: true,
                 index: true,

package/testutils/test_edge_global_schema.js

@@ -36,8 +36,6 @@ class EdgeWithDeletedAt extends ent_1.AssocEdge {
 exports.EdgeWithDeletedAt = EdgeWithDeletedAt;
 exports.testEdgeGlobalSchema = {
     extraEdgeFields: {
-        // need this to be lowerCamelCase because we do this based on field name
-        // #510
         deletedAt: (0, schema_1.TimestampType)({
             nullable: true,
             index: true,

package/tsc/compilerOptions.js

@@ -60,6 +60,9 @@ function readCompilerOptions(filePath) {
     if (options.moduleResolution === "node") {
         options.moduleResolution = typescript_1.default.ModuleResolutionKind.NodeJs;
     }
+    if (options.target) {
+        options.target = getTarget(options.target.toString());
+    }
     return options;
 }
 exports.readCompilerOptions = readCompilerOptions;
@@ -92,7 +95,7 @@ function getTarget(target) {
 exports.getTarget = getTarget;
 function getTargetFromCurrentDir() {
     const options = readCompilerOptions(".");
-    return getTarget(options.target?.toString());
+    return options.target ?? typescript_1.default.ScriptTarget.ESNext;
 }
 exports.getTargetFromCurrentDir = getTargetFromCurrentDir;
 function createSourceFile(target, file) {

package/tsc/transform_action.js

@@ -31,7 +31,7 @@ const typescript_1 = __importDefault(require("typescript"));
 const ast_1 = require("../tsc/ast");
 const viewer_1 = require("../core/viewer");
 const path = __importStar(require("path"));
-const snake_case_1 = require("snake-case");
+const names_1 = require("../names/names");
 // returns input and importPath
 function getBaseFileInfo(file, classInfo, sourceFile) {
     // @ts-ignore
@@ -155,7 +155,7 @@ class TransformAction {
                 klassContents += mm.getFullText(sourceFile);
             }
         }
-        const builderPath = `src/ent/generated/${(0, snake_case_1.snakeCase)(nodeName)}/actions/${(0, snake_case_1.snakeCase)(builder)}`;
+        const builderPath = `src/ent/generated/${(0, names_1.toFilePath)(nodeName)}/actions/${(0, names_1.toFilePath)(builder)}`;
         let imports = new Map([
             [
                 (0, ast_1.transformRelative)(file, this.customInfo.viewerInfo.path, this.customInfo.relativeImports),