drizzle-kit 0.9.25 → 0.9.26

package/index.js

@@ -6534,10 +6534,10 @@ var require_utils2 = __commonJS({
     };
     exports2.swap = (arr, index, pos) => {
       let len = arr.length;
-      let idx = pos === len ? 0 : pos < 0 ? len - 1 : pos;
+      let idx2 = pos === len ? 0 : pos < 0 ? len - 1 : pos;
       let choice = arr[index];
-      arr[index] = arr[idx];
-      arr[idx] = choice;
+      arr[index] = arr[idx2];
+      arr[idx2] = choice;
     };
     exports2.width = (stream, fallback = 80) => {
       let columns = stream && stream.columns ? stream.columns : fallback;
@@ -7487,9 +7487,9 @@ var require_prompt = __commonJS({
         let { buffer, input, prompt } = this.state;
         prompt = colors.unstyle(prompt);
         let buf = colors.unstyle(buffer);
-        let idx = buf.indexOf(prompt);
-        let header = buf.slice(0, idx);
-        let rest = buf.slice(idx);
+        let idx2 = buf.indexOf(prompt);
+        let header = buf.slice(0, idx2);
+        let rest = buf.slice(idx2);
         let lines = rest.split("\n");
         let first = lines[0];
         let last = lines[lines.length - 1];
@@ -8196,14 +8196,14 @@ var require_array = __commonJS({
       up() {
         let len = this.choices.length;
         let vis = this.visible.length;
-        let idx = this.index;
-        if (this.options.scroll === false && idx === 0) {
+        let idx2 = this.index;
+        if (this.options.scroll === false && idx2 === 0) {
           return this.alert();
         }
-        if (len > vis && idx === 0) {
+        if (len > vis && idx2 === 0) {
           return this.scrollUp();
         }
-        this.index = (idx - 1 % len + len) % len;
+        this.index = (idx2 - 1 % len + len) % len;
         if (this.isDisabled()) {
           return this.up();
         }
@@ -8212,14 +8212,14 @@ var require_array = __commonJS({
       down() {
         let len = this.choices.length;
         let vis = this.visible.length;
-        let idx = this.index;
-        if (this.options.scroll === false && idx === vis - 1) {
+        let idx2 = this.index;
+        if (this.options.scroll === false && idx2 === vis - 1) {
           return this.alert();
         }
-        if (len > vis && idx === vis - 1) {
+        if (len > vis && idx2 === vis - 1) {
           return this.scrollDown();
         }
-        this.index = (idx + 1) % len;
+        this.index = (idx2 + 1) % len;
         if (this.isDisabled()) {
           return this.down();
         }
@@ -11916,15 +11916,15 @@ var require_array_set = __commonJS({
     ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
       var sStr = hasNativeMap ? aStr : util.toSetString(aStr);
       var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
-      var idx = this._array.length;
+      var idx2 = this._array.length;
       if (!isDuplicate || aAllowDuplicates) {
         this._array.push(aStr);
       }
       if (!isDuplicate) {
         if (hasNativeMap) {
-          this._set.set(aStr, idx);
+          this._set.set(aStr, idx2);
         } else {
-          this._set[sStr] = idx;
+          this._set[sStr] = idx2;
         }
       }
     };
@@ -11938,9 +11938,9 @@ var require_array_set = __commonJS({
     };
     ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
       if (hasNativeMap) {
-        var idx = this._set.get(aStr);
-        if (idx >= 0) {
-          return idx;
+        var idx2 = this._set.get(aStr);
+        if (idx2 >= 0) {
+          return idx2;
         }
       } else {
         var sStr = util.toSetString(aStr);
@@ -13150,11 +13150,11 @@ var require_source_node = __commonJS({
           lastOriginalSource = null;
           sourceMappingActive = false;
         }
-        for (var idx = 0, length = chunk.length; idx < length; idx++) {
-          if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
+        for (var idx2 = 0, length = chunk.length; idx2 < length; idx2++) {
+          if (chunk.charCodeAt(idx2) === NEWLINE_CODE) {
             generated.line++;
             generated.column = 0;
-            if (idx + 1 === length) {
+            if (idx2 + 1 === length) {
               lastOriginalSource = null;
               sourceMappingActive = false;
             } else if (sourceMappingActive) {
@@ -47386,11 +47386,11 @@ var require_typescript = __commonJS({
       ts3.pathContainsNodeModules = pathContainsNodeModules;
       function parseNodeModuleFromPath(resolved) {
         var path2 = ts3.normalizePath(resolved);
-        var idx = path2.lastIndexOf(ts3.nodeModulesPathPart);
-        if (idx === -1) {
+        var idx2 = path2.lastIndexOf(ts3.nodeModulesPathPart);
+        if (idx2 === -1) {
           return void 0;
         }
-        var indexAfterNodeModules = idx + ts3.nodeModulesPathPart.length;
+        var indexAfterNodeModules = idx2 + ts3.nodeModulesPathPart.length;
         var indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterNodeModules);
         if (path2.charCodeAt(indexAfterNodeModules) === 64) {
           indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterPackageName);
@@ -47581,11 +47581,11 @@ var require_typescript = __commonJS({
         }
       }
       function parsePackageName(moduleName) {
-        var idx = moduleName.indexOf(ts3.directorySeparator);
+        var idx2 = moduleName.indexOf(ts3.directorySeparator);
         if (moduleName[0] === "@") {
-          idx = moduleName.indexOf(ts3.directorySeparator, idx + 1);
+          idx2 = moduleName.indexOf(ts3.directorySeparator, idx2 + 1);
         }
-        return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
+        return idx2 === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx2), rest: moduleName.slice(idx2 + 1) };
       }
       ts3.parsePackageName = parsePackageName;
       function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
@@ -63536,9 +63536,9 @@ var require_typescript = __commonJS({
           return false;
         }
         function getBestMatchIndexedAccessTypeOrUndefined(source, target, nameType) {
-          var idx = getIndexedAccessTypeOrUndefined(target, nameType);
-          if (idx) {
-            return idx;
+          var idx2 = getIndexedAccessTypeOrUndefined(target, nameType);
+          if (idx2) {
+            return idx2;
           }
           if (target.flags & 1048576) {
             var best = getBestMatchingType(source, target);
@@ -112609,12 +112609,12 @@ var require_typescript = __commonJS({
       function indexInTextChange(change, name) {
         if (ts3.startsWith(change, name))
           return 0;
-        var idx = change.indexOf(" " + name);
-        if (idx === -1)
-          idx = change.indexOf("." + name);
-        if (idx === -1)
-          idx = change.indexOf('"' + name);
-        return idx === -1 ? -1 : idx + 1;
+        var idx2 = change.indexOf(" " + name);
+        if (idx2 === -1)
+          idx2 = change.indexOf("." + name);
+        if (idx2 === -1)
+          idx2 = change.indexOf('"' + name);
+        return idx2 === -1 ? -1 : idx2 + 1;
       }
       function needsParentheses(expression) {
         return ts3.isBinaryExpression(expression) && expression.operatorToken.kind === 27 || ts3.isObjectLiteralExpression(expression) || ts3.isAsExpression(expression) && ts3.isObjectLiteralExpression(expression.expression);
@@ -147576,8 +147576,8 @@ var require_Parser = __commonJS({
         this.attribvalue = "";
       };
       Parser2.prototype.getInstructionName = function(value) {
-        var idx = value.search(reNameEnd);
-        var name = idx < 0 ? value : value.substr(0, idx);
+        var idx2 = value.search(reNameEnd);
+        var name = idx2 < 0 ? value : value.substr(0, idx2);
         if (this.lowerCaseTagNames) {
           name = name.toLowerCase();
         }
@@ -149134,16 +149134,16 @@ var require_helpers = __commonJS({
     exports2.uniqueSort = exports2.compareDocumentPosition = exports2.removeSubsets = void 0;
     var domhandler_1 = require_lib8();
     function removeSubsets(nodes) {
-      var idx = nodes.length;
-      while (--idx >= 0) {
-        var node = nodes[idx];
-        if (idx > 0 && nodes.lastIndexOf(node, idx - 1) >= 0) {
-          nodes.splice(idx, 1);
+      var idx2 = nodes.length;
+      while (--idx2 >= 0) {
+        var node = nodes[idx2];
+        if (idx2 > 0 && nodes.lastIndexOf(node, idx2 - 1) >= 0) {
+          nodes.splice(idx2, 1);
           continue;
         }
         for (var ancestor = node.parent; ancestor; ancestor = ancestor.parent) {
           if (nodes.includes(ancestor)) {
-            nodes.splice(idx, 1);
+            nodes.splice(idx2, 1);
             break;
           }
         }
@@ -149168,17 +149168,17 @@ var require_helpers = __commonJS({
         current = current.parent;
       }
       var maxIdx = Math.min(aParents.length, bParents.length);
-      var idx = 0;
-      while (idx < maxIdx && aParents[idx] === bParents[idx]) {
-        idx++;
+      var idx2 = 0;
+      while (idx2 < maxIdx && aParents[idx2] === bParents[idx2]) {
+        idx2++;
       }
-      if (idx === 0) {
+      if (idx2 === 0) {
         return 1;
       }
-      var sharedParent = aParents[idx - 1];
+      var sharedParent = aParents[idx2 - 1];
       var siblings = sharedParent.children;
-      var aSibling = aParents[idx];
-      var bSibling = bParents[idx];
+      var aSibling = aParents[idx2];
+      var bSibling = bParents[idx2];
       if (siblings.indexOf(aSibling) > siblings.indexOf(bSibling)) {
         if (sharedParent === nodeB) {
           return 4 | 16;
@@ -153950,15 +153950,15 @@ var require_parse2 = __commonJS({
       } else if (formula === "odd") {
         return [2, 1];
       }
-      var idx = 0;
+      var idx2 = 0;
       var a = 0;
       var sign = readSign();
       var number = readNumber();
-      if (idx < formula.length && formula.charAt(idx) === "n") {
-        idx++;
+      if (idx2 < formula.length && formula.charAt(idx2) === "n") {
+        idx2++;
         a = sign * (number !== null && number !== void 0 ? number : 1);
         skipWhitespace();
-        if (idx < formula.length) {
+        if (idx2 < formula.length) {
           sign = readSign();
           skipWhitespace();
           number = readNumber();
@@ -153966,32 +153966,32 @@ var require_parse2 = __commonJS({
           sign = number = 0;
         }
       }
-      if (number === null || idx < formula.length) {
+      if (number === null || idx2 < formula.length) {
         throw new Error("n-th rule couldn't be parsed ('" + formula + "')");
       }
       return [a, sign * number];
       function readSign() {
-        if (formula.charAt(idx) === "-") {
-          idx++;
+        if (formula.charAt(idx2) === "-") {
+          idx2++;
           return -1;
         }
-        if (formula.charAt(idx) === "+") {
-          idx++;
+        if (formula.charAt(idx2) === "+") {
+          idx2++;
         }
         return 1;
       }
       function readNumber() {
-        var start = idx;
+        var start = idx2;
         var value = 0;
-        while (idx < formula.length && formula.charCodeAt(idx) >= ZERO && formula.charCodeAt(idx) <= NINE) {
-          value = value * 10 + (formula.charCodeAt(idx) - ZERO);
-          idx++;
+        while (idx2 < formula.length && formula.charCodeAt(idx2) >= ZERO && formula.charCodeAt(idx2) <= NINE) {
+          value = value * 10 + (formula.charCodeAt(idx2) - ZERO);
+          idx2++;
         }
-        return idx === start ? null : value;
+        return idx2 === start ? null : value;
       }
       function skipWhitespace() {
-        while (idx < formula.length && whitespace.has(formula.charCodeAt(idx))) {
-          idx++;
+        while (idx2 < formula.length && whitespace.has(formula.charCodeAt(idx2))) {
+          idx2++;
         }
       }
     }
@@ -160967,9 +160967,9 @@ var BASE64_MAP = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
 function resolveYamlBinary(data) {
   if (data === null)
     return false;
-  var code, idx, bitlen = 0, max = data.length, map2 = BASE64_MAP;
-  for (idx = 0; idx < max; idx++) {
-    code = map2.indexOf(data.charAt(idx));
+  var code, idx2, bitlen = 0, max = data.length, map2 = BASE64_MAP;
+  for (idx2 = 0; idx2 < max; idx2++) {
+    code = map2.indexOf(data.charAt(idx2));
     if (code > 64)
       continue;
     if (code < 0)
@@ -160979,14 +160979,14 @@ function resolveYamlBinary(data) {
   return bitlen % 8 === 0;
 }
 function constructYamlBinary(data) {
-  var idx, tailbits, input = data.replace(/[\r\n=]/g, ""), max = input.length, map2 = BASE64_MAP, bits = 0, result2 = [];
-  for (idx = 0; idx < max; idx++) {
-    if (idx % 4 === 0 && idx) {
+  var idx2, tailbits, input = data.replace(/[\r\n=]/g, ""), max = input.length, map2 = BASE64_MAP, bits = 0, result2 = [];
+  for (idx2 = 0; idx2 < max; idx2++) {
+    if (idx2 % 4 === 0 && idx2) {
       result2.push(bits >> 16 & 255);
       result2.push(bits >> 8 & 255);
       result2.push(bits & 255);
     }
-    bits = bits << 6 | map2.indexOf(input.charAt(idx));
+    bits = bits << 6 | map2.indexOf(input.charAt(idx2));
   }
   tailbits = max % 4 * 6;
   if (tailbits === 0) {
@@ -161002,15 +161002,15 @@ function constructYamlBinary(data) {
   return new Uint8Array(result2);
 }
 function representYamlBinary(object) {
-  var result2 = "", bits = 0, idx, tail, max = object.length, map2 = BASE64_MAP;
-  for (idx = 0; idx < max; idx++) {
-    if (idx % 3 === 0 && idx) {
+  var result2 = "", bits = 0, idx2, tail, max = object.length, map2 = BASE64_MAP;
+  for (idx2 = 0; idx2 < max; idx2++) {
+    if (idx2 % 3 === 0 && idx2) {
       result2 += map2[bits >> 18 & 63];
       result2 += map2[bits >> 12 & 63];
       result2 += map2[bits >> 6 & 63];
       result2 += map2[bits & 63];
     }
-    bits = (bits << 8) + object[idx];
+    bits = (bits << 8) + object[idx2];
   }
   tail = max % 3;
   if (tail === 0) {
@@ -163277,7 +163277,8 @@ var CreateIndexConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, indexName, value } = statement;
-    return `CREATE INDEX IF NOT EXISTS ${indexName} ON ${tableName} (${value});`;
+    const indexPart = statement.isUnique ? "UNIQUE INDEX" : "INDEX";
+    return `CREATE ${indexPart} IF NOT EXISTS ${indexName} ON ${tableName} (${value});`;
   }
 };
 var DropIndexConvertor = class extends Convertor {
@@ -163380,10 +163381,10 @@ function applyJsonDiff(json1, json2) {
   const addedTables = tableEntries.filter((it) => it[0].includes("__added")).map((it) => it[1]).map((it) => {
     return __spreadProps(__spreadValues({}, it), {
       indexes: Object.entries(it.indexes).map((indexEntry) => {
-        const idx = indexEntry[1];
-        const name = idx["name"];
-        const columns = Object.values(idx["columns"]).map((it2) => it2["name"]);
-        return { name, columns };
+        const idx2 = indexEntry[1];
+        const name = idx2["name"];
+        const columns = Object.values(idx2["columns"]).map((it2) => it2["name"]);
+        return { name, columns, isUnique: idx2["isUnique"] };
       })
     });
   });
@@ -163430,22 +163431,22 @@ var findAlternationsInTable = (table) => {
   const deletedIndexes = Object.values(table.indexes__deleted || {}).map((it) => {
     const name = it["name"];
     const columns2 = Object.values(it["columns"]).map((it2) => it2["name"]);
-    return { name, columns: columns2 };
+    return { name, columns: columns2, isUnique: it["isUnique"] };
   }).concat(Object.keys(table.indexes || {}).filter((it) => it.includes("__deleted")).map((it) => {
-    const idx = table.indexes[it];
-    const name = idx["name"];
-    const columns2 = Object.values(idx["columns"]).map((it2) => it2["name"]);
-    return { name, columns: columns2 };
+    const idx2 = table.indexes[it];
+    const name = idx2["name"];
+    const columns2 = Object.values(idx2["columns"]).map((it2) => it2["name"]);
+    return { name, columns: columns2, isUnique: idx2["isUnique"] };
   }));
   const addedIndexes = Object.values(table.indexes__added || {}).map((it) => {
     const name = it["name"];
     const columns2 = Object.values(it["columns"]).map((it2) => it2["name"]);
-    return { name, columns: columns2 };
+    return { name, columns: columns2, isUnique: idx["isUnique"] };
   }).concat(Object.keys(table.indexes || {}).filter((it) => it.includes("__added")).map((it) => {
-    const idx = table.indexes[it];
-    const name = idx["name"];
-    const columns2 = Object.values(idx["columns"]).map((it2) => it2["name"]);
-    return { name, columns: columns2 };
+    const idx2 = table.indexes[it];
+    const name = idx2["name"];
+    const columns2 = Object.values(idx2["columns"]).map((it2) => it2["name"]);
+    return { name, columns: columns2, isUnique: idx2["isUnique"] };
   }));
   const mappedAltered = altered.map((it) => alternationsInColumn(it));
   return { name: table.name, deleted, added, altered: mappedAltered, addedIndexes, deletedIndexes };
@@ -163643,7 +163644,8 @@ var prepareCreateIndexesJson = (tableName, indexes) => {
       type: "create_index",
       tableName,
       indexName: index.name,
-      value: index.columns.join(", ")
+      value: index.columns.join(", "),
+      isUnique: index.isUnique
     };
   });
 };
@@ -163755,8 +163757,7 @@ var prepareAndMigrate = async () => {
   const dataFolder = drizzleConfig.dataFolder;
   const { prev, cur } = await prepareJsonSnapshots(migrationRootFolder, dataFolder);
   const sql = await prepareSQL(prev, cur);
-  const date = new Date();
-  const folderName = date.toISOString();
+  const folderName = prepareSnapshotFolderName();
   const migrationFolderPath = `./${migrationRootFolder}/${folderName}`;
   import_fs4.default.mkdirSync(migrationFolderPath);
   import_fs4.default.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2));
@@ -163786,6 +163787,13 @@ var prepareSQL = async (prev, cur) => {
   };
   return await applySnapshotsDiff(prev, cur, tablesResolver, columnsResolver);
 };
+var prepareSnapshotFolderName = () => {
+  const now = new Date();
+  return `${now.getFullYear()}${two(now.getUTCMonth() + 1)}${two(now.getUTCDate())}${two(now.getUTCHours())}${two(now.getUTCMinutes())}${two(now.getUTCSeconds())}`;
+};
+var two = (input) => {
+  return input.toString().padStart(2, "0");
+};
 
 // node_modules/source-map-support/register.js
 require_source_map_support().install();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "main": "index.js",
   "repository": "https://github.com/lambda-direct/drizzle-kit",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
@@ -30,32 +30,17 @@
     "xstate": "^4.25.0"
   },
   "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",
     "@types/pg": "^8.6.1",
-    "@types/react": "^17.0.13",
-    "@types/vorpal": "^1.12.1",
-    "@types/webpack": "^5.28.0",
     "@typescript-eslint/eslint-plugin": "4.4.1",
-    "drizzle-orm": "^0.9.19",
+    "drizzle-orm": "^0.10.2",
     "eslint": "^7.2.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-airbnb-typescript": "11.0.0",
     "eslint-plugin-import": "^2.22.1",
-    "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",
-    "webpack-node-externals": "^3.0.0",
-    "webpack-shebang-plugin": "^1.1.6"
+    "ts-jest": "^27.1.2"
   }
 }