drizzle-kit 0.9.24 → 0.9.25

package/index.js

@@ -159866,6 +159866,7 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
       }
     },
     check: {
+      entry: (0, import_xstate.send)({ type: "NEXT" }),
       on: {
         NEXT: [
           {
@@ -163355,7 +163356,7 @@ function diffForRenamedTables(pairs2) {
     return [newFrom, to];
   });
   const altered = renamed2.map((pair) => {
-    return diffForRenamedTable(pair.from, pair.to);
+    return diffForRenamedTable(pair[0], pair[1]);
   });
   return altered;
 }
@@ -163748,33 +163749,43 @@ var applySnapshotsDiff = async (json1, json2, tablesResolver, columnsResolver) =
 };
 
 // src/cli/commands/migrate.tsx
-var migrate = async () => {
+var prepareAndMigrate = async () => {
   const drizzleConfig = js_yaml_default.load(import_fs4.default.readFileSync("drizzle.config.yml", { encoding: "utf-8" }));
   const migrationRootFolder = drizzleConfig.migrationRootFolder || "drizzle";
   const dataFolder = drizzleConfig.dataFolder;
-  const { prev, cur } = await task("Preparing data schema json snapshot", async ({ setTitle }) => {
+  const { prev, cur } = await prepareJsonSnapshots(migrationRootFolder, dataFolder);
+  const sql = await prepareSQL(prev, cur);
+  const date = new Date();
+  const folderName = date.toISOString();
+  const migrationFolderPath = `./${migrationRootFolder}/${folderName}`;
+  import_fs4.default.mkdirSync(migrationFolderPath);
+  import_fs4.default.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2));
+  import_fs4.default.writeFileSync(`${migrationFolderPath}/migration.sql`, sql);
+};
+var prepareJsonSnapshots = async (migrationRootFolder, dataFolder) => {
+  return await task("Preparing data schema json snapshot", async ({ setTitle }) => {
     return migrationPreparator_default(migrationRootFolder, dataFolder);
   });
+};
+var prepareSQL = async (prev, cur) => {
   const tablesResolver = async (input) => {
-    const { created, deleted, renamed: renamed2 } = await promptTablesConflicts({
-      newTables: input.created,
-      missingTables: input.deleted
-    });
-    return { created, deleted, renamed: renamed2 };
+    try {
+      const { created, deleted, renamed: renamed2 } = await promptTablesConflicts({
+        newTables: input.created,
+        missingTables: input.deleted
+      });
+      return { created, deleted, renamed: renamed2 };
+    } catch (e) {
+      console.error(e);
+      throw e;
+    }
   };
   const columnsResolver = async (input) => {
     const result2 = await promptColumnsConflicts({ name: input.tableName, added: input.created, deleted: input.deleted });
-    return { tableName: input.tableName, created: result2.created, deleted: input.deleted, renamed: result2.renamed };
+    return { tableName: input.tableName, created: result2.created, deleted: result2.deleted, renamed: result2.renamed };
   };
-  const sql = await applySnapshotsDiff(prev, cur, tablesResolver, columnsResolver);
-  const date = new Date();
-  const folderName = date.toISOString();
-  const migrationFolderPath = `./${migrationRootFolder}/${folderName}`;
-  import_fs4.default.mkdirSync(migrationFolderPath);
-  import_fs4.default.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2));
-  import_fs4.default.writeFileSync(`${migrationFolderPath}/migration.sql`, sql);
+  return await applySnapshotsDiff(prev, cur, tablesResolver, columnsResolver);
 };
-var migrate_default = migrate;
 
 // node_modules/source-map-support/register.js
 require_source_map_support().install();
@@ -163782,19 +163793,9 @@ require_source_map_support().install();
 // node_modules/pretty-error/start.js
 require_PrettyError().start();
 
-// src/cli/commands/prepare-snapshot.ts
-function prepareSnapshot(path2) {
-  const result2 = serializer_default(path2);
-  return result2;
-}
-
 // src/cli/index.tsx
-var migrationCommand = new import_commander.Command("migrate").alias("mg").description("Migration").action(migrate_default);
-var prepareSnapshotCommand = new import_commander.Command("prepare").argument("<path>").action((path2) => {
-  console.log(JSON.stringify(prepareSnapshot(path2), null, 2));
-});
+var migrationCommand = new import_commander.Command("migrate").alias("mg").description("Migration").action(prepareAndMigrate);
 import_commander.program.addCommand(migrationCommand);
-import_commander.program.addCommand(prepareSnapshotCommand);
 import_commander.program.parse();
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.9.24",
+  "version": "0.9.25",
   "main": "index.js",
   "repository": "https://github.com/lambda-direct/drizzle-kit",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
@@ -12,6 +12,7 @@
     "start": "ts-node ./src/index.ts",
     "watch": "esbuild ./src/cli/index.tsx --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --watch",
     "diff": "ts-node ./src/diff.ts",
+    "sim": "ts-node ./dev/simulate.ts",
     "test": "jest --silent",
     "imports": "ts-node ./test.ts",
     "build": "esbuild ./src/cli/index.tsx --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild"
@@ -39,7 +40,7 @@
     "@types/vorpal": "^1.12.1",
     "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "4.4.1",
-    "drizzle-orm": "^0.9.12",
+    "drizzle-orm": "^0.9.19",
     "eslint": "^7.2.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-airbnb-typescript": "11.0.0",