drizzle-kit 0.9.1 → 0.9.5

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;

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

@@ -1,180 +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 { Named, TablesResultData } from 'cli/commands/migration/migrate';
-import createResolveTablesMachine from 'cli/machines/resolveTablesMachine';
-import formatDataForTable from 'cli/utils/formatDataForTable';
-import {
-  Action,
-  Confirmation,
-  actions,
-  confirmations,
-} from 'cli/utils/valuesForPrompts';
-
-export interface RenderTablesSelectProps<T extends Named> {
-  missingTables: T[],
-  newTables: T[],
-}
-
-interface Props<T extends Named> extends RenderTablesSelectProps<T> {
-  onDone: (value: TablesResultData<T>) => void;
-}
-
-const PromptTablesConflicts: React.FC<Props<any>> = ({
-  onDone,
-  newTables: newProps,
-  missingTables: missingProps,
-}) => {
-  const [current, send] = useMachine(createResolveTablesMachine({
-    missingTables: missingProps,
-    newTables: newProps,
-  }));
-
-  const {
-    missingItemIndex,
-    newTables,
-    missingTables,
-    createdTables,
-    renamedTables,
-    deletedTables,
-  } = 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>Missing tables:</Header>
-                <SelectInput
-                  items={missingTables!.map((table, i: number) => ({
-                    key: String(i),
-                    label: table.name,
-                    value: i,
-                  }))}
-                  onSelect={selectItemIndex}
-                />
-              </Box>
-              {!!newTables?.length && (
-                <Box flexDirection="column" paddingLeft={5}>
-                  <Header>New tables:</Header>
-                  <Box display="flex" flexDirection="column">
-                    {newTables.map(({ name }, i) => <Text key={name + i}>{name}</Text>)}
-                  </Box>
-                </Box>
-              )}
-            </Box>
-          </Box>
-        </>
-      );
-    }
-
-    if (current.matches('action.actionChoice')) {
-      const tempActions = !newTables!.length
-        ? actions.filter(({ value }) => value !== Action.RENAME)
-        : actions;
-
-      return (
-        <>
-          <Header>{`${missingTables![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>{`${missingTables![missingItemIndex]?.name} was renamed to:`}</Header>
-          <SelectInput
-            items={newTables!.map((table, i: number) => ({
-              key: String(i),
-              label: table.name,
-              value: i,
-            }))}
-            onSelect={selectNewItemIndex}
-          />
-        </>
-      );
-    }
-
-    if (current.matches('done')) {
-      onDone({
-        created: createdTables,
-        renamed: renamedTables,
-        deleted: deletedTables,
-      });
-    }
-
-    return (<></>);
-  };
-
-  return (!!deletedTables.length
-      || !!renamedTables.length
-      || !!createdTables.length) ? (
-        <Box flexDirection="column" margin={1}>
-          <Box flexDirection="column" marginBottom={0}>
-            <Header>Tables: </Header>
-            <Table
-              data={formatDataForTable([
-                {
-                  title: 'Deleted',
-                  values: deletedTables,
-                },
-                {
-                  title: 'Renamed',
-                  values: renamedTables,
-                },
-                {
-                  title: 'Created',
-                  values: createdTables,
-                },
-              ])}
-            />
-          </Box>
-          {renderDOM()}
-        </Box>
-    ) : renderDOM();
-};
-
-export default PromptTablesConflicts;

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

@@ -1,85 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Box, Newline, Text } from 'ink';
-import Spinner from 'ink-spinner';
-import { CreateTaskParams } from 'cli/components-api/index';
-
-enum StepState {
-  IN_PROGRESS,
-  SUCCESS,
-  FAIL
-}
-
-export interface CallbackProps {
-  setTitle: React.Dispatch<React.SetStateAction<string>>
-  setError: React.Dispatch<React.SetStateAction<any>>
-}
-
-interface Props<T> {
-  func: (props: CallbackProps) => T;
-  onDone: (result: T) => T;
-  titleStr: string;
-}
-
-const Task: React.FC<Props<any>> = <T extends unknown>(props: Props<T>) => {
-  const {
-    func,
-    onDone,
-    titleStr,
-  } = props;
-  const [title, setTitle] = useState<string>(titleStr);
-  const [state, setState] = useState<StepState>(StepState.IN_PROGRESS);
-  const [error, setError] = useState<any>(null);
-
-  useEffect(() => {
-    (async () => {
-      try {
-        const result = await func({ setTitle, setError });
-        setState(StepState.SUCCESS);
-        onDone(result);
-      } catch (e) {
-        setError(e);
-        setState(StepState.FAIL);
-      }
-    })();
-  }, []);
-
-  return (
-    <Box flexDirection="row">
-      <Box marginRight={1}>
-        {state === StepState.IN_PROGRESS ? (
-          <Text>
-            [
-            <Spinner type="dots" />
-            ]
-          </Text>
-        ) : state === StepState.SUCCESS ? (
-          <Text>
-            [
-            <Text color="green">✓</Text>
-            ]
-          </Text>
-        ) : (
-          <Text>
-            [
-            <Text color="red">×</Text>
-            ]
-          </Text>
-        )}
-
-        {state === StepState.FAIL ? (
-          <Text>
-            {title}
-            <Newline />
-            <Text color="red">{error!.message}</Text>
-          </Text>
-        ) : (
-          <>
-            <Text>{title}</Text>
-          </>
-        )}
-      </Box>
-    </Box>
-  );
-};
-
-export default Task;