neonctl 1.29.1 → 1.29.4

package/src/utils/point_in_time.ts

@@ -1,86 +0,0 @@
-import { Api } from '@neondatabase/api-client';
-import { looksLikeLSN, looksLikeTimestamp } from './formats.js';
-import { branchIdResolve } from './enrichers.js';
-
-export type PointInTime =
-  | {
-      tag: 'head';
-    }
-  | {
-      tag: 'lsn';
-      lsn: string;
-    }
-  | {
-      tag: 'timestamp';
-      timestamp: string;
-    };
-export type PointInTimeBranchId = {
-  branchId: string;
-} & PointInTime;
-
-export type PointInTimeBranch = {
-  branch: string;
-} & PointInTime;
-
-export interface PointInTimeProps {
-  targetBranchId: string;
-  pointInTime: string;
-  projectId: string;
-  api: Api<unknown>;
-}
-
-export class PointInTimeParseError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = 'PointInTimeParseError';
-  }
-}
-
-export const parsePITBranch = (input: string) => {
-  const splitIndex = input.lastIndexOf('@');
-  const sourceBranch = splitIndex === -1 ? input : input.slice(0, splitIndex);
-  const exactPIT = splitIndex === -1 ? null : input.slice(splitIndex + 1);
-  const result = {
-    branch: sourceBranch,
-    ...(exactPIT === null
-      ? { tag: 'head' }
-      : looksLikeLSN(exactPIT)
-        ? { tag: 'lsn', lsn: exactPIT }
-        : { tag: 'timestamp', timestamp: exactPIT }),
-  } satisfies PointInTimeBranch;
-  if (result.tag === 'timestamp' && !looksLikeTimestamp(result.timestamp)) {
-    throw new PointInTimeParseError('Invalid source branch format');
-  }
-  return result;
-};
-
-export const parsePointInTime = async ({
-  pointInTime,
-  targetBranchId,
-  projectId,
-  api,
-}: PointInTimeProps) => {
-  const parsedPIT = parsePITBranch(pointInTime);
-
-  let branchId = '';
-  if (parsedPIT.branch === '^self') {
-    branchId = targetBranchId;
-  } else if (parsedPIT.branch === '^parent') {
-    const { data } = await api.getProjectBranch(projectId, targetBranchId);
-    const { parent_id: parentId } = data.branch;
-    if (parentId == null) {
-      throw new PointInTimeParseError('Branch has no parent');
-    }
-    branchId = parentId;
-  } else {
-    branchId = await branchIdResolve({
-      branch: parsedPIT.branch,
-      projectId,
-      apiClient: api,
-    });
-  }
-
-  // @ts-expect-error extracting pit from parsedPIT
-  delete parsedPIT.branch;
-  return { ...parsedPIT, branchId };
-};

package/src/utils/psql.ts

@@ -1,29 +0,0 @@
-import { log } from '../log.js';
-import { spawn } from 'child_process';
-import which from 'which';
-
-export const psql = async (connection_uri: string, args: string[] = []) => {
-  const psqlPathOrNull = await which('psql', { nothrow: true });
-
-  if (psqlPathOrNull === null) {
-    log.error(`psql is not available in the PATH`);
-    process.exit(1);
-  }
-
-  log.info('Connecting to the database using psql...');
-  const psql = spawn(psqlPathOrNull, [connection_uri, ...args], {
-    stdio: 'inherit',
-  });
-
-  for (const signame of ['SIGINT', 'SIGTERM']) {
-    process.on(signame, (code) => {
-      if (!psql.killed && code !== null) {
-        psql.kill(code);
-      }
-    });
-  }
-
-  psql.on('exit', (code: number | null) => {
-    process.exit(code === null ? 1 : code);
-  });
-};

package/src/utils/string.ts

@@ -1,8 +0,0 @@
-export const toSnakeCase = (str: string) =>
-  str
-    .split(' ')
-    .map((word) => word.toLowerCase())
-    .join('_');
-
-export const isObject = (value: any) =>
-  value != null && value === Object(value);

package/src/utils/ui.ts

@@ -1,64 +0,0 @@
-// returns the next string if matches the given matcher,
-// otherwise returns null
-// consumes the line from the lines array
-export const consumeNextMatching = (lines: string[], matcher: RegExp) => {
-  while (lines.length > 0) {
-    const line = (lines.shift() as string).trim();
-    if (line === '') {
-      continue;
-    }
-    if (matcher.test(line)) {
-      return line;
-    }
-    return null;
-  }
-  return null;
-};
-
-// returns strings if next non-empty line matches the given matcher,
-// otherwise returns empty array
-// consumes the lines from the lines array
-export const consumeBlockIfMatches = (lines: string[], matcher: RegExp) => {
-  const result = [] as string[];
-  if (lines.length === 0) {
-    return result;
-  }
-
-  let line = lines.shift() as string;
-
-  while (line.trim() === '') {
-    line = lines.shift() as string;
-  }
-  if (!matcher.test(line)) {
-    lines.unshift(line);
-    return result;
-  }
-  result.push(line);
-  while (lines.length > 0) {
-    line = lines.shift() as string;
-    if (line.trim() === '') {
-      break;
-    }
-    result.push(line);
-  }
-  return result;
-};
-
-export const splitColumns = (line: string) => {
-  const result = line.trim().split(/\s{2,}/);
-  result[1] = result[1] ?? '';
-  if (result.length > 2) {
-    result[1] = result.slice(1).join(' ');
-  }
-  return result;
-};
-
-export const drawPointer = (width: number) => {
-  const result = [] as string[];
-  result.push('└');
-  for (let i = 0; i < width - 4; i++) {
-    result.push('─');
-  }
-  result.push('>');
-  return result.join('');
-};

package/src/writer.test.ts

@@ -1,98 +0,0 @@
-import { Writable } from 'node:stream';
-import { describe, it, expect } from '@jest/globals';
-import { writer } from './writer.js';
-
-class MockWritable extends Writable {
-  _data: Buffer[] = [];
-
-  get data() {
-    return this._data.map((chunk) => chunk.toString()).join('');
-  }
-
-  _write(chunk: Buffer) {
-    this._data.push(chunk);
-  }
-}
-
-describe('writer', () => {
-  describe('outputs yaml', () => {
-    it('outputs single data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'yaml', out: stream });
-      out.end({ foo: 'bar' }, { fields: ['foo'] });
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs single data with title', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'yaml', out: stream });
-      out.end({ foo: 'bar' }, { fields: ['foo'], title: 'baz' });
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs multiple data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'yaml', out: stream });
-      out
-        .write({ foo: 'bar' }, { fields: ['foo'], title: 'T1' })
-        .write({ baz: 'xyz' }, { fields: ['baz'], title: 'T2' })
-        .end();
-      expect(stream.data).toMatchSnapshot();
-    });
-  });
-
-  describe('outputs json', () => {
-    it('outputs single data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'json', out: stream });
-      out.end({ foo: 'bar' }, { fields: ['foo'] });
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs single data with title', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'json', out: stream });
-      out.end({ foo: 'bar' }, { fields: ['foo'], title: 'baz' });
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs multiple data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'json', out: stream });
-      out
-        .write({ foo: 'bar' }, { fields: ['foo'], title: 'T1' })
-        .write({ baz: 'xyz' }, { fields: ['baz'], title: 'T2' })
-        .end();
-      expect(stream.data).toMatchSnapshot();
-    });
-  });
-
-  describe('outputs table', () => {
-    it('outputs single data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'table', out: stream });
-      out.end({ foo: 'bar', extra: 'extra' }, { fields: ['foo'] });
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs single data with title', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'table', out: stream });
-      out.end(
-        { foo: 'bar', extra: 'extra' },
-        { fields: ['foo'], title: 'baz' },
-      );
-      expect(stream.data).toMatchSnapshot();
-    });
-
-    it('outputs multiple data', () => {
-      const stream = new MockWritable();
-      const out = writer({ output: 'table', out: stream });
-      out
-        .write({ foo: 'bar', extra: 'extra' }, { fields: ['foo'], title: 'T1' })
-        .write({ baz: 'xyz', extra: 'extra' }, { fields: ['baz'], title: 'T2' })
-        .end();
-      expect(stream.data).toMatchSnapshot();
-    });
-  });
-});

package/src/writer.ts

@@ -1,131 +0,0 @@
-import YAML from 'yaml';
-import Table from 'cli-table';
-import chalk from 'chalk';
-
-import { CommonProps } from './types.js';
-import { isCi } from './env.js';
-import { isObject, toSnakeCase } from './utils/string.js';
-
-type ExtractFromArray<T> = T extends (infer R)[] ? R : T;
-type OnlyStrings<T> = T extends string ? T : never;
-
-type WriteOutConfig<T> = {
-  // Fields to output in human-readable format
-  fields: Readonly<OnlyStrings<keyof ExtractFromArray<T>>[]>;
-  // Title of the output
-  title?: string;
-};
-
-const writeYaml = (chunks: { data: any; config: WriteOutConfig<any> }[]) => {
-  return YAML.stringify(
-    chunks.length === 1
-      ? chunks[0].data
-      : Object.fromEntries(
-          chunks.map(({ config, data }, idx) => [
-            config.title ? toSnakeCase(config.title) : idx,
-            data,
-          ]),
-        ),
-    null,
-    2,
-  );
-};
-
-const writeJson = (chunks: { data: any; config: WriteOutConfig<any> }[]) => {
-  return JSON.stringify(
-    chunks.length === 1
-      ? chunks[0].data
-      : Object.fromEntries(
-          chunks.map(({ config, data }, idx) => [
-            config.title ? toSnakeCase(config.title) : idx,
-            data,
-          ]),
-        ),
-    null,
-    2,
-  );
-};
-
-const writeTable = (
-  chunks: { data: any; config: WriteOutConfig<any> }[],
-  out: NodeJS.WritableStream,
-) => {
-  chunks.forEach(({ data, config }) => {
-    const arrayData = Array.isArray(data) ? data : [data];
-    const fields = config.fields.filter((field) =>
-      arrayData.some((item) => item[field] !== undefined && item[field] !== ''),
-    );
-    const table = new Table({
-      style: {
-        head: ['green'],
-      },
-      head: fields.map((field: string) =>
-        field
-          .split('_')
-          .map((word) => word[0].toUpperCase() + word.slice(1))
-          .join(' '),
-      ),
-    });
-    arrayData.forEach((item) => {
-      table.push(
-        fields.map((field: string | number) => {
-          const value = item[field];
-          return Array.isArray(value)
-            ? value.join('\n')
-            : isObject(value)
-              ? JSON.stringify(value, null, 2)
-              : value;
-        }),
-      );
-    });
-
-    if (config.title) {
-      out.write((isCi() ? config.title : chalk.bold(config.title)) + '\n');
-    }
-    out.write(table.toString());
-    out.write('\n');
-  });
-};
-
-/**
- *
- * Parses the output format, takes data and writes the output to stdout.
- *
- * @example
- * const { data } = await props.apiClient.listProjectBranches(props.project.id);
- * // to output single data
- * writer(props).end(data, { fields: ['id', 'name', 'created_at'] })
- * // to output multiple data
- * writer(props)
- *   .write(data, { fields: ['id', 'name', 'created_at'], title: 'branches' })
- *   .write(data, { fields: ['id', 'created_at'], title: 'endpoints' })
- *   .end()
- */
-export const writer = (
-  props: Pick<CommonProps, 'output'> & { out?: NodeJS.WritableStream },
-) => {
-  const out = props.out ?? process.stdout;
-  const chunks: { data: any; config: WriteOutConfig<any> }[] = [];
-
-  return {
-    write<T>(data: T, config: WriteOutConfig<T>) {
-      chunks.push({ data, config });
-      return this;
-    },
-    end: <T>(...args: [T, WriteOutConfig<T>] | []) => {
-      if (args.length === 2) {
-        chunks.push({ data: args[0], config: args[1] });
-      }
-
-      if (props.output == 'yaml') {
-        return out.write(writeYaml(chunks));
-      }
-
-      if (props.output == 'json') {
-        return out.write(writeJson(chunks));
-      }
-
-      return writeTable(chunks, out);
-    },
-  };
-};

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ES2022",
-    "strict": true,
-    "outDir": "./dist",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "skipLibCheck": true
-  },
-  "include": ["src/**/*.ts"]
-}