drizzle-kit 0.9.2 → 0.9.3

package/fstest.ts

@@ -1,50 +0,0 @@
-import fs from 'fs'
-import serialize from './src/serilizer'
-
-// TODO: export as a function w
-
-const dry = {
-    version: "1",
-    tables: {},
-    enums: {}
-}
-
-const prepareMigration = (path: string = 'drizzle'): {} => {
-    const root = path
-    const files = fs.readdirSync('./')
-    const drizzleFolder = files.find((it) => {
-        return it === root
-    })
-
-    if (!drizzleFolder) {
-        fs.mkdirSync(root)
-    }
-
-    const migrationFolders = fs.readdirSync(`./${root}`)
-
-    let prevSnapshot;
-
-    if (migrationFolders.length === 0) {
-        prevSnapshot = dry
-    } else {
-        migrationFolders.sort()
-        const lastSnapshotFolder = migrationFolders[migrationFolders.length - 1]
-        prevSnapshot = fs.readFileSync(`./${root}/${lastSnapshotFolder}/snapshot.json`).toJSON()
-    }
-
-    const timestamp = Date.now()
-    const migrationFolder = `./${root}/${timestamp}`
-    fs.mkdirSync(migrationFolder)
-
-    const version = 'v3'
-    const dir = `./data/${version}`
-    const tbls = `${dir}/tables/`
-    const tps = `${dir}/types/`
-
-    const result = serialize(tbls, tps)
-    fs.writeFileSync(`${migrationFolder}/snapshot.json`, JSON.stringify(result, null, 2))
-
-    return { prev: prevSnapshot, cur: result }
-}
-
-export default prepareMigration;

package/index.ts

@@ -1,16 +0,0 @@
-import serialize from './src/serilizer'
-import yaml from 'js-yaml'
-import fs from 'fs'
-
-const version = 'v2'
-const dir = `./data/${version}`
-const tbls = `${dir}/tables/`
-const tps = `${dir}/types/`
-
-// const config: Config = yaml.load(fs.readFileSync('config.yml', {encoding: 'utf-8'})) as Config;
-// console.log(config)
-
-const result = serialize(tbls, tps)
-const outName = `${version}_${new Date().getTime()}.json`
-fs.writeFileSync(`./out/${outName}`, JSON.stringify(result, null, 2))
-console.log(`-----> .../${outName}`)

package/readme.md

@@ -1,9 +0,0 @@
-todo: configurable migrations folder
-todo: configurable tables and enums folder
-todo: ability to just have single folder with either tables and enums in one file or spreaded in multiple files
-
-stage0 -> fstest.js
-it does check if migration folder exists, if not - creates one. Checks if initial migration exists, if not - creates one and initiate init migration generation with dryrun snapshot1. If init migration exists - initiate migration generation with last chronologically available snapshot folder.
-
-stage1 -> ./index.ts
-It is now harcoded, what it does - it takes directory for tables and enums and generates json snapshot of the whole project schema.

package/serializer.ts

@@ -1,139 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable new-cap */
-/* eslint-disable global-require */
-/* eslint-disable import/no-dynamic-require */
-import { AbstractTable, Column, DB } from 'drizzle-orm';
-import ColumnType from 'drizzle-orm/columns/types/columnType';
-import PgEnum from 'drizzle-orm/columns/types/pgEnum';
-import TableIndex from 'drizzle-orm/indexes/tableIndex';
-import Enum from 'drizzle-orm/types/type';
-import { Pool } from 'pg';
-
-interface ColumnAsObject {
-  [name: string]: {
-    name?: string;
-    type?: string;
-    primaryKey?: boolean;
-    autoincrement?: boolean;
-    unique?: boolean;
-    default?: any;
-    notNull?: boolean;
-    references?: {
-      table: string;
-      column: string;
-    };
-  };
-}
-
-interface IndexColumnAsObject {
-  [name: string]: {
-    name?: string;
-  };
-}
-
-interface IndexAsObject {
-  [name: string]: {
-    name?: string;
-    columns?: ColumnAsObject;
-  };
-}
-
-interface TableAsObject {
-  [name: string]: {
-    name: string;
-    columns: ColumnAsObject;
-    indexes: {
-      [name: string]: {
-        name?: string;
-        type?: string;
-      };
-    };
-  };
-}
-
-interface EnumAsObject {
-  [name: string]: {
-    name: string;
-    values: string[];
-  };
-}
-
-export default class MigrationSerializer {
-  db = new DB(new Pool());
-
-  public generate = (tables: AbstractTable<any>[], enums: Enum<any>[]) => {
-    const result: TableAsObject = {};
-
-    for (const table of tables) {
-      const tableEntries = Object.entries(table);
-      const columnToReturn: ColumnAsObject = {};
-      const indexToReturn: IndexAsObject = {};
-
-      for (const properties of tableEntries) {
-        const key = properties[0];
-        const value = properties[1];
-        if (value instanceof TableIndex) {
-          const columns = value.getColumns();
-          const name = value.indexName();
-
-          const indexColumnToReturn: IndexColumnAsObject = {};
-
-          for (const column of columns) {
-            const columnName = column.getColumnName();
-            indexColumnToReturn[columnName] = {
-              name: columnName,
-            };
-          }
-
-          indexToReturn[name] = {
-            name,
-            columns: indexColumnToReturn,
-          };
-        }
-
-        if (value instanceof Column) {
-          columnToReturn[key] = {
-            name: value.getColumnName(),
-            type: (value.getColumnType() as ColumnType).getDbName(),
-            primaryKey: !!value.primaryKeyName,
-            autoincrement: value.isAutoIncrement(),
-            unique: !!value.uniqueKeyName,
-            default: value.getDefaultValue() === null ? undefined : value.getDefaultValue(),
-            notNull: !value.isNullableFlag,
-          };
-
-          const referenced = value.getReferenced();
-          if (referenced) {
-            columnToReturn[key].references = {
-              table: referenced.getParentName(),
-              column: referenced.getColumnName(),
-            };
-          }
-        }
-      }
-
-      result[table.tableName()] = {
-        name: table.tableName(),
-        columns: columnToReturn,
-        indexes: indexToReturn,
-      };
-    }
-
-    // const enumsToReturn = enums.map((it) => {
-    //   return { name: it.name, values: it.values }
-    // });
-
-    const enumsToReturn = enums.reduce<{[key:string]: Enum<any>}>((map, obj) => {
-      const key = obj.name;
-      const newValues = obj.values.reduce((mapped, value) => {
-        mapped[value] = value;
-        return mapped;
-      }, {});
-
-      map[key] = { name: obj.name, values: newValues };
-      return map;
-    }, {});
-
-    return { version: '1', tables: result, enums: enumsToReturn };
-  };
-}

package/src/cli/commands/migration/index.tsx

@@ -1,10 +0,0 @@
-import { program } from 'commander';
-
-import migrate from './migrate';
-
-const cmd = program
-  .command('migrate')
-  .alias('mg')
-  .description('Migration')
-  .action(migrate);
-cmd.command('start').description('Start migration').action(migrate);

package/src/cli/commands/migration/migrate/index.tsx

@@ -1,164 +0,0 @@
-import { task, promptTablesConflicts, promptColumnsConflicts } from 'cli/components-api';
-import fs from 'fs';
-import * as differ from '../../../../differ';
-import prepareMigration from 'migrationPreparator';
-
-import { prepareAddValuesToEnumJson, prepareAlterTableColumnsJson, prepareCreateEnumJson, prepareCreateIndexesJson, prepareCreateTableJson, prepareDropIndexesJson, prepareDropTableJson, prepareRenameTableJson } from '../../../../jsonStatements';
-import { fromJson } from '../../../../sqlgenerator';
-
-export interface TablesResultData<T> {
-  created: T[],
-  renamed: RenamedObject<T>[],
-  deleted: T[],
-}
-
-export interface ColumnsResultData<T extends Named> {
-  created: T[],
-  renamed: RenamedObject<T>[],
-  deleted: T[],
-}
-
-export interface Named {
-  name: string
-}
-
-export interface RenamedObject<T> {
-  old: T,
-  new: T
-}
-
-const two = (num: number) => {
-  return num.toString().padStart(2, '0')
-}
-
-const migrate = async () => {
-  const timeoutE = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)).then(() => {
-    throw new Error('Checking error handling');
-  });
-
-  const timeout = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
-  const migrationRootFolder = 'drizzle' // or from config/params
-  const { prev, cur } = await task('preparing data schema json snapshot', async ({ setTitle }) => {
-    return prepareMigration(migrationRootFolder, './data/v2')
-  });
-
-  // const j1 = JSON.parse(fs.readFileSync('./out/v1_1634546745488.json', 'utf8'));
-  // const j2 = JSON.parse(fs.readFileSync('./out/v2_1634549601361.json', 'utf8'));
-
-  const diff = await task('preparing schemas diff', async ({ setTitle }) => {
-    return differ.differ(prev, cur);
-  });
-
-  const { created, renamed, deleted } = await promptTablesConflicts({
-    newTables: diff.addedTables,
-    missingTables: diff.deletedTables,
-  });
-
-  const jsonStatements: any[] = []
-
-  const jsonCreateTables = created.map(it => {
-    return prepareCreateTableJson(it)
-  })
-
-  const jsonCreateIndexesForCreatedTables = created.map(it => {
-    return prepareCreateIndexesJson(it.name, it.indexes)
-  }).flat()
-
-  const jsonDropTables = deleted.map(it => {
-    return prepareDropTableJson(it)
-  })
-
-  const jsonRenameTables = renamed.map(it => {
-    return prepareRenameTableJson(it.old, it.new)
-  })
-
-  // const createNewTables = created.map(it => {
-  //   return prepareCreateTable(it)
-  // })
-  // console.log(createNewTables.join('\n').trim())
-
-  // const deleteTables = deleted.map(it => {
-  //   return prepareDropTable(it)
-  // })
-  // console.log(deleteTables.join('\n').trim())
-
-  const renamedWithAlternations = differ.diffForRenamed(renamed)
-  const allAltered = diff.alteredTablesWithColumns.concat(renamedWithAlternations)
-
-  const allAlteredResolved = []
-  for (const table of allAltered) {
-    const result = await promptColumnsConflicts(table);
-
-    const { deleted, added, ...ini } = table
-
-    allAlteredResolved.push({ ...ini, ...result })
-  }
-
-  // console.log(JSON.stringify(allAlteredResolved, null, 2))
-
-  // const renameTables = renamed.map(it => {
-  //   return prepareRenameTable(it.from, it.to)
-  // })
-  // console.log(renameTables.join('\n').trim())
-
-  const jsonAlterTables = allAlteredResolved.map(it => {
-    return prepareAlterTableColumnsJson(it)
-  }).flat()
-
-  const jsonCreateIndexesForAllAlteredTables = allAlteredResolved.map(it => {
-    return prepareCreateIndexesJson(it.name, it.addedIndexes || {})
-  }).flat()
-
-  const jsonDropIndexesForAllAlteredTables = allAlteredResolved.map(it => {
-    return prepareDropIndexesJson(it.name, it.deletedIndexes || {})
-  }).flat()
-
-  // // Enums:
-  // // - создание енама ✅
-  // // - переименование енама (пока не делаю)⏳
-  // // - добавление вэлью к енаму ✅
-  // // - ренейм вейлью у енама (пока не делаю, это надо запрашивать опять же через слай)⏳
-  // // - удаление енама -> чекать не используется ли где-то енам и сначала ранить миграции и в самом конце удаление енама⏳
-  // // - удаление вэлью из енама -> блок ❌
-  // const enums = result.addedEnums.map(it => {
-  //   return prepareCreateEnum(it.name, it.values)
-  // })
-
-  const createEnums = diff.addedEnums.map(it => {
-    return prepareCreateEnumJson(it.name, it.values)
-  })
-
-  //todo: block enum rename, enum value rename and enun deletion for now
-  const jsonAlterEnumsWithAddedValues = diff.alteredEnums.map(it => {
-    return prepareAddValuesToEnumJson(it.name, it.addedValues)
-  }).flat()
-
-  jsonStatements.push(...createEnums)
-  jsonStatements.push(...jsonAlterEnumsWithAddedValues)
-  jsonStatements.push(...jsonCreateTables)
-  jsonStatements.push(...jsonCreateIndexesForCreatedTables)
-  jsonStatements.push(...jsonDropTables)
-  jsonStatements.push(...jsonRenameTables)
-  jsonStatements.push(...jsonAlterTables)
-  jsonStatements.push(...jsonCreateIndexesForAllAlteredTables)
-  jsonStatements.push(...jsonDropIndexesForAllAlteredTables)
-
-  // console.log(JSON.stringify(jsonStatements, null, 2))
-  // console.log(jsonStatements)
-
-  const sqlStatements = fromJson(jsonStatements)
-  console.log(sqlStatements.join('\n'))
-
-  // todo: save results to a new migration folder
-  const date = new Date()
-  // const folderName = `${date.getFullYear()}-${two(date.getMonth())}-${two(date.getDate())} ${two(date.getHours())}:${two(date.getMinutes())}:${two(date.getSeconds())}`
-  const folderName = date.toISOString()
-  const migrationFolderPath = `./${migrationRootFolder}/${folderName}`
-  fs.mkdirSync(migrationFolderPath)
-  fs.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2))
-  fs.writeFileSync(`${migrationFolderPath}/migration.sql`, sqlStatements.join('\n'))
-
-};
-
-export default migrate;

package/src/cli/components-api/ComponentsList.tsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { useSnapshot } from 'valtio';
-
-interface Props {
-  componentsList: React.ReactElement<any, any>[];
-}
-
-const ComponentsList: React.FC<Props> = ({
-  componentsList,
-}) => {
-  useSnapshot(componentsList);
-
-  return (
-    <>
-      {componentsList.map((component, i) => ({ ...component, key: i }))}
-    </>
-  );
-};
-
-export default ComponentsList;

package/src/cli/components-api/CreateApp.tsx

@@ -1,19 +0,0 @@
-import { render } from 'ink';
-import React from 'react';
-
-import ComponentsList from 'cli/components-api/ComponentsList';
-
-const createApp = (componentsList: React.ReactElement<any, any>[]) => {
-  const inkApp = render(<ComponentsList componentsList={componentsList} />);
-
-  return {
-    remove() {
-      inkApp.rerender(null);
-      inkApp.unmount();
-      inkApp.clear();
-      inkApp.cleanup();
-    },
-  };
-};
-
-export default createApp;

package/src/cli/components-api/components/PromptColumnsConflicts.tsx

@@ -1,171 +0,0 @@
-import React from 'react';
-import { Box, Text } from 'ink';
-import SelectInput from 'ink-select-input';
-import Table, { Header } from 'ink-table';
-import { useMachine } from '@xstate/react';
-import { Item } from 'ink-select-input/build/SelectInput';
-
-import { ColumnsResultData, Named } from 'cli/commands/migration/migrate';
-import formatDataForTable from 'cli/utils/formatDataForTable';
-import {
-  Action,
-  Confirmation,
-  actions,
-  confirmations,
-} from 'cli/utils/valuesForPrompts';
-import createResolveColumnsMachine, { TableWithColumn } from 'cli/machines/resolveColumnsMachine';
-
-interface Props {
-  onDone: (value: ColumnsResultData<Named>) => void
-  tableWithColumns: TableWithColumn,
-}
-
-const PromptColumnsConflicts: React.FC<Props> = ({
-  onDone,
-  tableWithColumns: props,
-}) => {
-  const [current, send] = useMachine(
-    createResolveColumnsMachine({ tableWithColumns: props }),
-  );
-
-  const {
-    tableName,
-    addedColumns,
-    deletedColumns,
-    missingItemIndex,
-    created,
-    renamed,
-    deleted,
-  } = current.context;
-
-  const selectItemIndex = (item: Item<number>) => {
-    send({ type: 'CHOICE_ITEM', itemIndex: item.value });
-  };
-
-  const selectNewItemIndex = (item: Item<number>) => {
-    send({ type: 'CHOICE_NEW_ITEM', itemIndex: item.value });
-  };
-
-  const selectAction = (action: Item<Action>) => {
-    send({ type: action.value });
-  };
-
-  const confirm = (confirmationItem: Item<Confirmation>) => {
-    send({ type: confirmationItem.value });
-  };
-
-  const renderDOM = () => {
-    if (current.matches('table')) {
-      return (
-        <>
-          <Box display="flex" flexDirection="column">
-            <Box display="flex">
-              <Box flexDirection="column">
-                <Header>{`Table "${tableName}" missing columns:`}</Header>
-                <SelectInput
-                  items={deletedColumns!.map((column, i: number) => ({
-                    key: String(i),
-                    label: column.name,
-                    value: i,
-                  }))}
-                  onSelect={selectItemIndex}
-                />
-              </Box>
-              {!!addedColumns?.length && (
-                <Box flexDirection="column" paddingLeft={5}>
-                  <Header>New tables:</Header>
-                  <Box display="flex" flexDirection="column">
-                    {addedColumns.map(({ name }, i) => <Text key={name + i}>{name}</Text>)}
-                  </Box>
-                </Box>
-              )}
-            </Box>
-          </Box>
-        </>
-      );
-    }
-
-    if (current.matches('action.actionChoice')) {
-      const tempActions = !addedColumns!.length
-        ? actions.filter(({ value }) => value !== Action.RENAME)
-        : actions;
-
-      return (
-        <>
-          <Header>{`${deletedColumns![missingItemIndex]?.name} is:`}</Header>
-          <SelectInput items={tempActions} onSelect={selectAction} />
-        </>
-      );
-    }
-
-    if (current.matches('confirmationDelete')) {
-      return (
-        <>
-          <Header>!!! Data in table will be lost !!!</Header>
-          <Text>Are you sure?</Text>
-          <SelectInput items={confirmations} onSelect={confirm} />
-        </>
-      );
-    }
-
-    if (current.matches('confirmationRename')) {
-      return (
-        <>
-          <Header>Are you sure?</Header>
-          <SelectInput items={confirmations} onSelect={confirm} />
-        </>
-      );
-    }
-
-    if (current.matches('action.rename')) {
-      return (
-        <>
-          <Header>{`${deletedColumns![missingItemIndex]?.name} was renamed to:`}</Header>
-          <SelectInput
-            items={addedColumns!.map((table, i: number) => ({
-              key: String(i),
-              label: table.name,
-              value: i,
-            }))}
-            onSelect={selectNewItemIndex}
-          />
-        </>
-      );
-    }
-
-    if (current.matches('done')) {
-      onDone({ created, renamed, deleted });
-    }
-
-    return (<></>);
-  };
-
-  return (!!deleted.length
-      || !!renamed.length
-      || !!created.length) ? (
-        <Box flexDirection="column" margin={1}>
-          <Box flexDirection="column" marginBottom={0}>
-            <Header>{`${tableName} columns:`}</Header>
-            <Table
-              data={formatDataForTable([
-                {
-                  title: 'Deleted',
-                  values: deleted,
-                },
-                {
-                  title: 'Renamed',
-                  values: renamed,
-                },
-                {
-                  title: 'Created',
-                  values: created,
-                },
-              ])}
-            />
-          </Box>
-          {renderDOM()}
-        </Box>
-    ) : renderDOM();
-};
-
-export default PromptColumnsConflicts;