Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __fixtures__/output/schemas/actions_public.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUID, Timestamp } from "./_common";
import { Timestamp,UUID } from "./_common";
export interface ast_actions {
id: number;
database_id: UUID;
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/output/schemas/collections_public.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUID, Timestamp } from "./_common";
import { Timestamp,UUID } from "./_common";
export interface check_constraint {
id: UUID;
database_id: UUID;
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/output/schemas/db_migrate.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUID, Timestamp } from "./_common";
import { Timestamp,UUID } from "./_common";
export interface migrate_files {
id: UUID;
database_id: UUID | null;
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/output/schemas/objects_private.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUID, Timestamp } from "./_common";
import { Timestamp,UUID } from "./_common";
export interface object {
id: UUID;
database_id: UUID;
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/output/schemas/txs_public.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UUID, Timestamp } from "./_common";
import { Timestamp,UUID } from "./_common";
export interface commit {
id: UUID;
message: string | null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getConnections, PgTestClient } from 'pgsql-test';
import cases from 'jest-in-case';
import { getConnections, PgTestClient } from 'pgsql-test';

let pg: PgTestClient;
let teardown: () => Promise<void>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getConnections, PgTestClient } from 'pgsql-test';
import cases from 'jest-in-case';
import { getConnections, PgTestClient } from 'pgsql-test';

let pg: PgTestClient;
let teardown: () => Promise<void>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getConnections, PgTestClient } from 'pgsql-test';
import cases from 'jest-in-case';
import { getConnections, PgTestClient } from 'pgsql-test';

let pg: PgTestClient;
let teardown: () => Promise<void>;
Expand Down
8 changes: 4 additions & 4 deletions functions/send-email-link/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import app from '@constructive-io/knative-job-fn';
import { GraphQLClient } from 'graphql-request';
import gql from 'graphql-tag';
import { generate } from '@launchql/mjml';
import { send } from '@launchql/postmaster';
import { parseEnvBoolean } from '@pgpmjs/env';
import { GraphQLClient } from 'graphql-request';
import gql from 'graphql-tag';

const isDryRun = parseEnvBoolean(process.env.SEND_EMAIL_LINK_DRY_RUN) ?? false;

Expand Down Expand Up @@ -269,7 +269,7 @@ export const sendEmailLink = async (
});

if (isDryRun) {
// eslint-disable-next-line no-console
console.log('[send-email-link] DRY RUN email (skipping send)', {
email_type: params.email_type,
email: params.email,
Expand Down Expand Up @@ -326,7 +326,7 @@ if (require.main === module) {
const port = Number(process.env.PORT ?? 8080);
// @constructive-io/knative-job-fn exposes a .listen method that delegates to the Express app
(app as any).listen(port, () => {
// eslint-disable-next-line no-console
console.log(`[send-email-link] listening on port ${port}`);
});
}
8 changes: 4 additions & 4 deletions functions/simple-email/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import app from '@constructive-io/knative-job-fn';
import { parseEnvBoolean } from '@pgpmjs/env';
import { send as sendEmail } from '@launchql/postmaster';
import { parseEnvBoolean } from '@pgpmjs/env';

type SimpleEmailPayload = {
to: string;
Expand Down Expand Up @@ -62,7 +62,7 @@ app.post('*', async (req: any, res: any, next: any) => {
};

if (isDryRun) {
// eslint-disable-next-line no-console
console.log('[simple-email] DRY RUN email (no send)', logContext);
} else {
// Send via the Postmaster package (Mailgun or configured provider)
Expand All @@ -75,7 +75,7 @@ app.post('*', async (req: any, res: any, next: any) => {
...(replyTo && { replyTo })
});

// eslint-disable-next-line no-console
console.log('[simple-email] Sent email', logContext);
}

Expand All @@ -93,7 +93,7 @@ if (require.main === module) {
const port = Number(process.env.PORT ?? 8080);
// @constructive-io/knative-job-fn exposes a .listen method that delegates to the underlying Express app
(app as any).listen(port, () => {
// eslint-disable-next-line no-console
console.log(`[simple-email] listening on port ${port}`);
});
}
8 changes: 5 additions & 3 deletions graphile/graphile-i18n/__tests__/plugin.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import '../test-utils/env';
import { join } from 'path';

import type { GraphQLQueryFn } from 'graphile-test';
import { getConnections, snapshot } from 'graphile-test';
import { join } from 'path';
import { seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import type { GraphQLQueryFn } from 'graphile-test';
import { GetProjectsAndLanguages } from '../test-utils/queries';

import LangPlugin, { additionalGraphQLContextFromRequest } from '../src';
import { GetProjectsAndLanguages } from '../test-utils/queries';

const SCHEMA = process.env.SCHEMA ?? 'app_public';
const sql = (f: string) => join(__dirname, '../sql', f);
Expand Down
9 changes: 4 additions & 5 deletions graphile/graphile-i18n/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import LangPlugin from './plugin';

export { LangPlugin, type LangPluginOptions } from './plugin';
export { env } from './env';
export {
additionalGraphQLContextFromRequest,
makeLanguageDataLoaderForTable,
type I18nGraphQLContext,
type I18nRequestLike,
type LanguageDataLoaderFactory
} from './middleware';
export { env } from './env';
type LanguageDataLoaderFactory,
makeLanguageDataLoaderForTable} from './middleware';
export { LangPlugin, type LangPluginOptions } from './plugin';

export default LangPlugin;
2 changes: 1 addition & 1 deletion graphile/graphile-i18n/src/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import langParser from 'accept-language-parser';
import DataLoader from 'dataloader';
import type { IncomingHttpHeaders } from 'http';
import type { PoolClient } from 'pg';
import langParser from 'accept-language-parser';

import env from './env';

Expand Down
8 changes: 4 additions & 4 deletions graphile/graphile-many-to-many/__tests__/queries.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import '../test-utils/env';

import { existsSync, promises as fs, readdirSync } from 'fs';
import { join } from 'path';
import { getConnections } from 'graphile-test';
import type { GraphQLQueryFn } from 'graphile-test';
import { getConnections } from 'graphile-test';
import { join } from 'path';
import { seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

Expand Down Expand Up @@ -104,9 +104,9 @@ describe.each(fixtureSets.map(({ schema, fixtures }) => [schema, fixtures] as co
const normalizedResult = JSON.parse(JSON.stringify(result));
if (normalizedResult.errors) {
// surface underlying errors in case snapshots hide details
/* eslint-disable no-console */
console.log(normalizedResult.errors.map((error: any) => error.originalError ?? error));
/* eslint-enable no-console */
}
expect(normalizedResult).toMatchSnapshot();
});
Expand Down
10 changes: 5 additions & 5 deletions graphile/graphile-many-to-many/__tests__/schema.test.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import '../test-utils/env';

import { existsSync } from 'fs';
import { join } from 'path';
import { getIntrospectionQuery, buildClientSchema, printSchema } from 'graphql';
import { lexicographicSortSchema } from 'graphql/utilities';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import type { PostGraphileOptions } from 'postgraphile';
import { getConnections } from 'graphile-test';
import type { GraphQLQueryFn } from 'graphile-test';
import { getConnections } from 'graphile-test';
import { buildClientSchema, getIntrospectionQuery, printSchema } from 'graphql';
import { lexicographicSortSchema } from 'graphql/utilities';
import { join } from 'path';
import { seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import type { PostGraphileOptions } from 'postgraphile';

import PgManyToManyPlugin from '../src';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import type { Build } from 'graphile-build';
import type { PgClass } from 'graphile-build-pg';
import type {
GraphQLFieldConfigMap,
GraphQLObjectType,
GraphQLResolveInfo,
GraphQLNamedType,
GraphQLNullableType,
GraphQLObjectType,
GraphQLResolveInfo,
GraphQLType
} from 'graphql';

Expand Down
5 changes: 3 additions & 2 deletions graphile/graphile-meta-schema/__tests__/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import '../test-utils/env';

import PgManyToMany from '@graphile-contrib/pg-many-to-many';
import { getConnections, type GraphQLQueryFn,seed, snapshot } from 'graphile-test';
import { join } from 'path';
import { getConnections, snapshot, seed, type GraphQLQueryFn } from 'graphile-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import { PgMetaschemaPlugin } from '../src';
import {
GetBelongsToRelations,
GetHasManyRelations,
Expand All @@ -13,7 +15,6 @@ import {
GetMetaSchema,
GetMetaSchemaUnion
} from '../test-utils/queries';
import { PgMetaschemaPlugin } from '../src';

const SCHEMA = process.env.SCHEMA ?? 'app_meta';
const sql = (file: string) => join(__dirname, '../sql', file);
Expand Down
5 changes: 3 additions & 2 deletions graphile/graphile-pg-type-mappings/__tests__/plugin.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { join } from 'path';
import { getConnections, GraphQLQueryFn } from 'graphile-test';
import gql from 'graphql-tag';
import { join } from 'path';
import { seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import gql from 'graphql-tag';

import CustomPgTypeMappingsPlugin from '../src';

const SCHEMA = 'public';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { readdirSync } from 'fs';
import { readFile } from 'fs/promises';
import { join } from 'path';
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
import PostgisPlugin from 'graphile-postgis';
import type { GraphQLQueryFnObj } from 'graphile-test';
import { getConnectionsObject, seed, snapshot } from 'graphile-test';
import { join } from 'path';
import type { PgTestClient } from 'pgsql-test/test-client';
import PostgisPlugin from 'graphile-postgis';
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';

import PostgisConnectionFilterPlugin from '../../src';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';
import PostgisPlugin from 'graphile-postgis';
import { join } from 'path';
import { Pool } from 'pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import PostgisPlugin from 'graphile-postgis';
import ConnectionFilterPlugin from 'graphile-plugin-connection-filter';

import PostgisConnectionFilterPlugin from '../../../src';
import { printSchemaOrdered } from '../../../test-utils/printSchema';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import '../../test-utils/env';

import { readdirSync } from 'fs';
import { readFile } from 'fs/promises';
import { join } from 'path';
import type { Plugin } from 'graphile-build';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import type { GraphQLQueryFnObj } from 'graphile-test';
import { getConnectionsObject, seed, snapshot } from 'graphile-test';
import { join } from 'path';
import type { PgTestClient } from 'pgsql-test/test-client';
import type { PostGraphileOptions } from 'postgraphile';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import '../../../test-utils/env';

import { PgConnectionArgCondition } from 'graphile-build-pg';
import { join } from 'path';
import { Pool } from 'pg';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import CustomOperatorsPlugin from '../../../test-utils/customOperatorsPlugin';
import ConnectionFilterPlugin from '../../../src/index';
import CustomOperatorsPlugin from '../../../test-utils/customOperatorsPlugin';
import { printSchemaOrdered } from '../../../test-utils/printSchema';

const SCHEMA = process.env.SCHEMA ?? 'p';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import '../../../test-utils/env';

import { PgConnectionArgCondition } from 'graphile-build-pg';
import { join } from 'path';
import { Pool } from 'pg';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import ConnectionFilterPlugin from '../../../src/index';
import { printSchemaOrdered } from '../../../test-utils/printSchema';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import '../../../test-utils/env';

import { PgConnectionArgCondition } from 'graphile-build-pg';
import { join } from 'path';
import { Pool } from 'pg';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import ConnectionFilterPlugin from '../../../src/index';
import { printSchemaOrdered } from '../../../test-utils/printSchema';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import '../../../test-utils/env';

import { PgConnectionArgCondition } from 'graphile-build-pg';
import { join } from 'path';
import { Pool } from 'pg';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import ConnectionFilterPlugin from '../../../src/index';
import { printSchemaOrdered } from '../../../test-utils/printSchema';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import '../../../test-utils/env';

import { PgConnectionArgCondition } from 'graphile-build-pg';
import { join } from 'path';
import { Pool } from 'pg';
import { PgConnectionArgCondition } from 'graphile-build-pg';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';
import {
createPostGraphileSchema,
type PostGraphileOptions,
} from 'postgraphile';
import { getConnections, seed } from 'pgsql-test';
import type { PgTestClient } from 'pgsql-test/test-client';

import ConnectionFilterPlugin from '../../../src/index';
import { printSchemaOrdered } from '../../../test-utils/printSchema';
Expand Down
Loading