drizzle-kit 0.9.23 → 0.9.24

package/index.js

@@ -159822,14 +159822,9 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
         NEXT: [
           {
             target: "done",
-            cond: "isMissingTablesResolved",
+            cond: "isResolved",
             actions: ["resolveRemaining"]
           },
-          {
-            target: "done",
-            cond: "isNewTablesResolved",
-            actions: ["resolveMissing"]
-          },
           {
             target: "table"
           }
@@ -159858,7 +159853,7 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
       on: {
         CANCEL: "action.actionChoice",
         CONFIRM: [
-          { target: "final", actions: ["delete"] }
+          { target: "check", actions: ["delete"] }
         ]
       }
     },
@@ -159866,21 +159861,20 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
       on: {
         CANCEL: "action.actionChoice",
         CONFIRM: [
-          { target: "final", actions: ["rename"] }
+          { target: "check", actions: ["rename"] }
         ]
       }
     },
-    final: {
-      entry: (0, import_xstate.send)({ type: "NEXT" }),
+    check: {
       on: {
         NEXT: [
           {
             target: "done",
-            cond: "isMissingTablesResolved",
+            cond: "isResolved",
             actions: ["resolveRemaining"]
           },
           {
-            target: "idle"
+            target: "table"
           }
         ]
       }
@@ -159889,8 +159883,7 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
   }
 }, {
   guards: {
-    isMissingTablesResolved: ({ missingTables }) => !missingTables.length,
-    isNewTablesResolved: ({ newTables }) => !newTables.length
+    isResolved: ({ missingTables, newTables }) => !missingTables.length || !newTables.length
   },
   actions: {
     choseItem: (0, import_xstate.assign)({
@@ -159935,14 +159928,12 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
         newTables,
         createdTables
       }) => [...createdTables, ...newTables],
-      newTables: (context) => []
-    }),
-    resolveMissing: (0, import_xstate.assign)({
       deletedTables: ({
         missingTables,
         deletedTables
       }) => [...deletedTables, ...missingTables],
-      missingTables: (context) => []
+      missingTables: (context) => [],
+      newTables: (context) => []
     })
   }
 });
@@ -159970,14 +159961,9 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
         NEXT: [
           {
             target: "done",
-            cond: "isMissingColumnsResolved",
+            cond: "isResolved",
             actions: ["resolveRemaining"]
           },
-          {
-            target: "done",
-            cond: "isNewColumnsResolved",
-            actions: ["resolveMissing"]
-          },
           {
             target: "table"
           }
@@ -160006,7 +159992,7 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
       on: {
         CANCEL: "action.actionChoice",
         CONFIRM: [
-          { target: "final", actions: ["delete"] }
+          { target: "check", actions: ["delete"] }
         ]
       }
     },
@@ -160014,17 +160000,17 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
       on: {
         CANCEL: "action.actionChoice",
         CONFIRM: [
-          { target: "final", actions: ["rename"] }
+          { target: "check", actions: ["rename"] }
         ]
       }
     },
-    final: {
+    check: {
       entry: (0, import_xstate2.send)({ type: "NEXT" }),
       on: {
         NEXT: [
           {
             target: "done",
-            cond: "isMissingColumnsResolved",
+            cond: "isResolved",
             actions: ["resolveRemaining"]
           },
           {
@@ -160037,8 +160023,7 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
   }
 }, {
   guards: {
-    isMissingColumnsResolved: ({ deletedColumns }) => !deletedColumns.length,
-    isNewColumnsResolved: ({ addedColumns }) => !addedColumns.length
+    isResolved: ({ deletedColumns, addedColumns }) => !deletedColumns.length || !addedColumns.length
   },
   actions: {
     choseItem: (0, import_xstate2.assign)({
@@ -160083,14 +160068,12 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
         addedColumns,
         created
       }) => [...created, ...addedColumns],
-      addedColumns: (context) => []
-    }),
-    resolveMissing: (0, import_xstate2.assign)({
       deleted: ({
         deletedColumns,
         deleted
       }) => [...deleted, ...deletedColumns],
-      deletedColumns: (context) => []
+      deletedColumns: (context) => [],
+      addedColumns: (context) => []
     })
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.9.23",
+  "version": "0.9.24",
   "main": "index.js",
   "repository": "https://github.com/lambda-direct/drizzle-kit",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
@@ -12,7 +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",
-    "test": "ts-node ./index.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"
   },
@@ -30,6 +30,7 @@
   },
   "devDependencies": {
     "@types/ink-divider": "^2.0.2",
+    "@types/jest": "^27.0.3",
     "@types/js-yaml": "^4.0.3",
     "@types/lodash.flatten": "^4.4.6",
     "@types/object-hash": "2.1.1",
@@ -46,8 +47,10 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^1.7.0",
+    "jest": "^27.4.5",
     "prettier": "^2.3.2",
     "source-map-loader": "^3.0.0",
+    "ts-jest": "^27.1.2",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
     "webpack": "^5.42.0",
     "webpack-cli": "^4.7.2",