drizzle-kit 0.9.23 → 0.9.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +152 -159
  2. package/package.json +7 -18
package/index.js CHANGED
@@ -6534,10 +6534,10 @@ var require_utils2 = __commonJS({
6534
6534
  };
6535
6535
  exports2.swap = (arr, index, pos) => {
6536
6536
  let len = arr.length;
6537
- let idx = pos === len ? 0 : pos < 0 ? len - 1 : pos;
6537
+ let idx2 = pos === len ? 0 : pos < 0 ? len - 1 : pos;
6538
6538
  let choice = arr[index];
6539
- arr[index] = arr[idx];
6540
- arr[idx] = choice;
6539
+ arr[index] = arr[idx2];
6540
+ arr[idx2] = choice;
6541
6541
  };
6542
6542
  exports2.width = (stream, fallback = 80) => {
6543
6543
  let columns = stream && stream.columns ? stream.columns : fallback;
@@ -7487,9 +7487,9 @@ var require_prompt = __commonJS({
7487
7487
  let { buffer, input, prompt } = this.state;
7488
7488
  prompt = colors.unstyle(prompt);
7489
7489
  let buf = colors.unstyle(buffer);
7490
- let idx = buf.indexOf(prompt);
7491
- let header = buf.slice(0, idx);
7492
- let rest = buf.slice(idx);
7490
+ let idx2 = buf.indexOf(prompt);
7491
+ let header = buf.slice(0, idx2);
7492
+ let rest = buf.slice(idx2);
7493
7493
  let lines = rest.split("\n");
7494
7494
  let first = lines[0];
7495
7495
  let last = lines[lines.length - 1];
@@ -8196,14 +8196,14 @@ var require_array = __commonJS({
8196
8196
  up() {
8197
8197
  let len = this.choices.length;
8198
8198
  let vis = this.visible.length;
8199
- let idx = this.index;
8200
- if (this.options.scroll === false && idx === 0) {
8199
+ let idx2 = this.index;
8200
+ if (this.options.scroll === false && idx2 === 0) {
8201
8201
  return this.alert();
8202
8202
  }
8203
- if (len > vis && idx === 0) {
8203
+ if (len > vis && idx2 === 0) {
8204
8204
  return this.scrollUp();
8205
8205
  }
8206
- this.index = (idx - 1 % len + len) % len;
8206
+ this.index = (idx2 - 1 % len + len) % len;
8207
8207
  if (this.isDisabled()) {
8208
8208
  return this.up();
8209
8209
  }
@@ -8212,14 +8212,14 @@ var require_array = __commonJS({
8212
8212
  down() {
8213
8213
  let len = this.choices.length;
8214
8214
  let vis = this.visible.length;
8215
- let idx = this.index;
8216
- if (this.options.scroll === false && idx === vis - 1) {
8215
+ let idx2 = this.index;
8216
+ if (this.options.scroll === false && idx2 === vis - 1) {
8217
8217
  return this.alert();
8218
8218
  }
8219
- if (len > vis && idx === vis - 1) {
8219
+ if (len > vis && idx2 === vis - 1) {
8220
8220
  return this.scrollDown();
8221
8221
  }
8222
- this.index = (idx + 1) % len;
8222
+ this.index = (idx2 + 1) % len;
8223
8223
  if (this.isDisabled()) {
8224
8224
  return this.down();
8225
8225
  }
@@ -11916,15 +11916,15 @@ var require_array_set = __commonJS({
11916
11916
  ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
11917
11917
  var sStr = hasNativeMap ? aStr : util.toSetString(aStr);
11918
11918
  var isDuplicate = hasNativeMap ? this.has(aStr) : has.call(this._set, sStr);
11919
- var idx = this._array.length;
11919
+ var idx2 = this._array.length;
11920
11920
  if (!isDuplicate || aAllowDuplicates) {
11921
11921
  this._array.push(aStr);
11922
11922
  }
11923
11923
  if (!isDuplicate) {
11924
11924
  if (hasNativeMap) {
11925
- this._set.set(aStr, idx);
11925
+ this._set.set(aStr, idx2);
11926
11926
  } else {
11927
- this._set[sStr] = idx;
11927
+ this._set[sStr] = idx2;
11928
11928
  }
11929
11929
  }
11930
11930
  };
@@ -11938,9 +11938,9 @@ var require_array_set = __commonJS({
11938
11938
  };
11939
11939
  ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
11940
11940
  if (hasNativeMap) {
11941
- var idx = this._set.get(aStr);
11942
- if (idx >= 0) {
11943
- return idx;
11941
+ var idx2 = this._set.get(aStr);
11942
+ if (idx2 >= 0) {
11943
+ return idx2;
11944
11944
  }
11945
11945
  } else {
11946
11946
  var sStr = util.toSetString(aStr);
@@ -13150,11 +13150,11 @@ var require_source_node = __commonJS({
13150
13150
  lastOriginalSource = null;
13151
13151
  sourceMappingActive = false;
13152
13152
  }
13153
- for (var idx = 0, length = chunk.length; idx < length; idx++) {
13154
- if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
13153
+ for (var idx2 = 0, length = chunk.length; idx2 < length; idx2++) {
13154
+ if (chunk.charCodeAt(idx2) === NEWLINE_CODE) {
13155
13155
  generated.line++;
13156
13156
  generated.column = 0;
13157
- if (idx + 1 === length) {
13157
+ if (idx2 + 1 === length) {
13158
13158
  lastOriginalSource = null;
13159
13159
  sourceMappingActive = false;
13160
13160
  } else if (sourceMappingActive) {
@@ -47386,11 +47386,11 @@ var require_typescript = __commonJS({
47386
47386
  ts3.pathContainsNodeModules = pathContainsNodeModules;
47387
47387
  function parseNodeModuleFromPath(resolved) {
47388
47388
  var path2 = ts3.normalizePath(resolved);
47389
- var idx = path2.lastIndexOf(ts3.nodeModulesPathPart);
47390
- if (idx === -1) {
47389
+ var idx2 = path2.lastIndexOf(ts3.nodeModulesPathPart);
47390
+ if (idx2 === -1) {
47391
47391
  return void 0;
47392
47392
  }
47393
- var indexAfterNodeModules = idx + ts3.nodeModulesPathPart.length;
47393
+ var indexAfterNodeModules = idx2 + ts3.nodeModulesPathPart.length;
47394
47394
  var indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterNodeModules);
47395
47395
  if (path2.charCodeAt(indexAfterNodeModules) === 64) {
47396
47396
  indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path2, indexAfterPackageName);
@@ -47581,11 +47581,11 @@ var require_typescript = __commonJS({
47581
47581
  }
47582
47582
  }
47583
47583
  function parsePackageName(moduleName) {
47584
- var idx = moduleName.indexOf(ts3.directorySeparator);
47584
+ var idx2 = moduleName.indexOf(ts3.directorySeparator);
47585
47585
  if (moduleName[0] === "@") {
47586
- idx = moduleName.indexOf(ts3.directorySeparator, idx + 1);
47586
+ idx2 = moduleName.indexOf(ts3.directorySeparator, idx2 + 1);
47587
47587
  }
47588
- return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
47588
+ return idx2 === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx2), rest: moduleName.slice(idx2 + 1) };
47589
47589
  }
47590
47590
  ts3.parsePackageName = parsePackageName;
47591
47591
  function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
@@ -63536,9 +63536,9 @@ var require_typescript = __commonJS({
63536
63536
  return false;
63537
63537
  }
63538
63538
  function getBestMatchIndexedAccessTypeOrUndefined(source, target, nameType) {
63539
- var idx = getIndexedAccessTypeOrUndefined(target, nameType);
63540
- if (idx) {
63541
- return idx;
63539
+ var idx2 = getIndexedAccessTypeOrUndefined(target, nameType);
63540
+ if (idx2) {
63541
+ return idx2;
63542
63542
  }
63543
63543
  if (target.flags & 1048576) {
63544
63544
  var best = getBestMatchingType(source, target);
@@ -112609,12 +112609,12 @@ var require_typescript = __commonJS({
112609
112609
  function indexInTextChange(change, name) {
112610
112610
  if (ts3.startsWith(change, name))
112611
112611
  return 0;
112612
- var idx = change.indexOf(" " + name);
112613
- if (idx === -1)
112614
- idx = change.indexOf("." + name);
112615
- if (idx === -1)
112616
- idx = change.indexOf('"' + name);
112617
- return idx === -1 ? -1 : idx + 1;
112612
+ var idx2 = change.indexOf(" " + name);
112613
+ if (idx2 === -1)
112614
+ idx2 = change.indexOf("." + name);
112615
+ if (idx2 === -1)
112616
+ idx2 = change.indexOf('"' + name);
112617
+ return idx2 === -1 ? -1 : idx2 + 1;
112618
112618
  }
112619
112619
  function needsParentheses(expression) {
112620
112620
  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({
147576
147576
  this.attribvalue = "";
147577
147577
  };
147578
147578
  Parser2.prototype.getInstructionName = function(value) {
147579
- var idx = value.search(reNameEnd);
147580
- var name = idx < 0 ? value : value.substr(0, idx);
147579
+ var idx2 = value.search(reNameEnd);
147580
+ var name = idx2 < 0 ? value : value.substr(0, idx2);
147581
147581
  if (this.lowerCaseTagNames) {
147582
147582
  name = name.toLowerCase();
147583
147583
  }
@@ -149134,16 +149134,16 @@ var require_helpers = __commonJS({
149134
149134
  exports2.uniqueSort = exports2.compareDocumentPosition = exports2.removeSubsets = void 0;
149135
149135
  var domhandler_1 = require_lib8();
149136
149136
  function removeSubsets(nodes) {
149137
- var idx = nodes.length;
149138
- while (--idx >= 0) {
149139
- var node = nodes[idx];
149140
- if (idx > 0 && nodes.lastIndexOf(node, idx - 1) >= 0) {
149141
- nodes.splice(idx, 1);
149137
+ var idx2 = nodes.length;
149138
+ while (--idx2 >= 0) {
149139
+ var node = nodes[idx2];
149140
+ if (idx2 > 0 && nodes.lastIndexOf(node, idx2 - 1) >= 0) {
149141
+ nodes.splice(idx2, 1);
149142
149142
  continue;
149143
149143
  }
149144
149144
  for (var ancestor = node.parent; ancestor; ancestor = ancestor.parent) {
149145
149145
  if (nodes.includes(ancestor)) {
149146
- nodes.splice(idx, 1);
149146
+ nodes.splice(idx2, 1);
149147
149147
  break;
149148
149148
  }
149149
149149
  }
@@ -149168,17 +149168,17 @@ var require_helpers = __commonJS({
149168
149168
  current = current.parent;
149169
149169
  }
149170
149170
  var maxIdx = Math.min(aParents.length, bParents.length);
149171
- var idx = 0;
149172
- while (idx < maxIdx && aParents[idx] === bParents[idx]) {
149173
- idx++;
149171
+ var idx2 = 0;
149172
+ while (idx2 < maxIdx && aParents[idx2] === bParents[idx2]) {
149173
+ idx2++;
149174
149174
  }
149175
- if (idx === 0) {
149175
+ if (idx2 === 0) {
149176
149176
  return 1;
149177
149177
  }
149178
- var sharedParent = aParents[idx - 1];
149178
+ var sharedParent = aParents[idx2 - 1];
149179
149179
  var siblings = sharedParent.children;
149180
- var aSibling = aParents[idx];
149181
- var bSibling = bParents[idx];
149180
+ var aSibling = aParents[idx2];
149181
+ var bSibling = bParents[idx2];
149182
149182
  if (siblings.indexOf(aSibling) > siblings.indexOf(bSibling)) {
149183
149183
  if (sharedParent === nodeB) {
149184
149184
  return 4 | 16;
@@ -153950,15 +153950,15 @@ var require_parse2 = __commonJS({
153950
153950
  } else if (formula === "odd") {
153951
153951
  return [2, 1];
153952
153952
  }
153953
- var idx = 0;
153953
+ var idx2 = 0;
153954
153954
  var a = 0;
153955
153955
  var sign = readSign();
153956
153956
  var number = readNumber();
153957
- if (idx < formula.length && formula.charAt(idx) === "n") {
153958
- idx++;
153957
+ if (idx2 < formula.length && formula.charAt(idx2) === "n") {
153958
+ idx2++;
153959
153959
  a = sign * (number !== null && number !== void 0 ? number : 1);
153960
153960
  skipWhitespace();
153961
- if (idx < formula.length) {
153961
+ if (idx2 < formula.length) {
153962
153962
  sign = readSign();
153963
153963
  skipWhitespace();
153964
153964
  number = readNumber();
@@ -153966,32 +153966,32 @@ var require_parse2 = __commonJS({
153966
153966
  sign = number = 0;
153967
153967
  }
153968
153968
  }
153969
- if (number === null || idx < formula.length) {
153969
+ if (number === null || idx2 < formula.length) {
153970
153970
  throw new Error("n-th rule couldn't be parsed ('" + formula + "')");
153971
153971
  }
153972
153972
  return [a, sign * number];
153973
153973
  function readSign() {
153974
- if (formula.charAt(idx) === "-") {
153975
- idx++;
153974
+ if (formula.charAt(idx2) === "-") {
153975
+ idx2++;
153976
153976
  return -1;
153977
153977
  }
153978
- if (formula.charAt(idx) === "+") {
153979
- idx++;
153978
+ if (formula.charAt(idx2) === "+") {
153979
+ idx2++;
153980
153980
  }
153981
153981
  return 1;
153982
153982
  }
153983
153983
  function readNumber() {
153984
- var start = idx;
153984
+ var start = idx2;
153985
153985
  var value = 0;
153986
- while (idx < formula.length && formula.charCodeAt(idx) >= ZERO && formula.charCodeAt(idx) <= NINE) {
153987
- value = value * 10 + (formula.charCodeAt(idx) - ZERO);
153988
- idx++;
153986
+ while (idx2 < formula.length && formula.charCodeAt(idx2) >= ZERO && formula.charCodeAt(idx2) <= NINE) {
153987
+ value = value * 10 + (formula.charCodeAt(idx2) - ZERO);
153988
+ idx2++;
153989
153989
  }
153990
- return idx === start ? null : value;
153990
+ return idx2 === start ? null : value;
153991
153991
  }
153992
153992
  function skipWhitespace() {
153993
- while (idx < formula.length && whitespace.has(formula.charCodeAt(idx))) {
153994
- idx++;
153993
+ while (idx2 < formula.length && whitespace.has(formula.charCodeAt(idx2))) {
153994
+ idx2++;
153995
153995
  }
153996
153996
  }
153997
153997
  }
@@ -159822,14 +159822,9 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
159822
159822
  NEXT: [
159823
159823
  {
159824
159824
  target: "done",
159825
- cond: "isMissingTablesResolved",
159825
+ cond: "isResolved",
159826
159826
  actions: ["resolveRemaining"]
159827
159827
  },
159828
- {
159829
- target: "done",
159830
- cond: "isNewTablesResolved",
159831
- actions: ["resolveMissing"]
159832
- },
159833
159828
  {
159834
159829
  target: "table"
159835
159830
  }
@@ -159858,7 +159853,7 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
159858
159853
  on: {
159859
159854
  CANCEL: "action.actionChoice",
159860
159855
  CONFIRM: [
159861
- { target: "final", actions: ["delete"] }
159856
+ { target: "check", actions: ["delete"] }
159862
159857
  ]
159863
159858
  }
159864
159859
  },
@@ -159866,21 +159861,21 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
159866
159861
  on: {
159867
159862
  CANCEL: "action.actionChoice",
159868
159863
  CONFIRM: [
159869
- { target: "final", actions: ["rename"] }
159864
+ { target: "check", actions: ["rename"] }
159870
159865
  ]
159871
159866
  }
159872
159867
  },
159873
- final: {
159868
+ check: {
159874
159869
  entry: (0, import_xstate.send)({ type: "NEXT" }),
159875
159870
  on: {
159876
159871
  NEXT: [
159877
159872
  {
159878
159873
  target: "done",
159879
- cond: "isMissingTablesResolved",
159874
+ cond: "isResolved",
159880
159875
  actions: ["resolveRemaining"]
159881
159876
  },
159882
159877
  {
159883
- target: "idle"
159878
+ target: "table"
159884
159879
  }
159885
159880
  ]
159886
159881
  }
@@ -159889,8 +159884,7 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
159889
159884
  }
159890
159885
  }, {
159891
159886
  guards: {
159892
- isMissingTablesResolved: ({ missingTables }) => !missingTables.length,
159893
- isNewTablesResolved: ({ newTables }) => !newTables.length
159887
+ isResolved: ({ missingTables, newTables }) => !missingTables.length || !newTables.length
159894
159888
  },
159895
159889
  actions: {
159896
159890
  choseItem: (0, import_xstate.assign)({
@@ -159935,14 +159929,12 @@ var createResolveTablesMachine = (props) => (0, import_xstate.createMachine)({
159935
159929
  newTables,
159936
159930
  createdTables
159937
159931
  }) => [...createdTables, ...newTables],
159938
- newTables: (context) => []
159939
- }),
159940
- resolveMissing: (0, import_xstate.assign)({
159941
159932
  deletedTables: ({
159942
159933
  missingTables,
159943
159934
  deletedTables
159944
159935
  }) => [...deletedTables, ...missingTables],
159945
- missingTables: (context) => []
159936
+ missingTables: (context) => [],
159937
+ newTables: (context) => []
159946
159938
  })
159947
159939
  }
159948
159940
  });
@@ -159970,14 +159962,9 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
159970
159962
  NEXT: [
159971
159963
  {
159972
159964
  target: "done",
159973
- cond: "isMissingColumnsResolved",
159965
+ cond: "isResolved",
159974
159966
  actions: ["resolveRemaining"]
159975
159967
  },
159976
- {
159977
- target: "done",
159978
- cond: "isNewColumnsResolved",
159979
- actions: ["resolveMissing"]
159980
- },
159981
159968
  {
159982
159969
  target: "table"
159983
159970
  }
@@ -160006,7 +159993,7 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
160006
159993
  on: {
160007
159994
  CANCEL: "action.actionChoice",
160008
159995
  CONFIRM: [
160009
- { target: "final", actions: ["delete"] }
159996
+ { target: "check", actions: ["delete"] }
160010
159997
  ]
160011
159998
  }
160012
159999
  },
@@ -160014,17 +160001,17 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
160014
160001
  on: {
160015
160002
  CANCEL: "action.actionChoice",
160016
160003
  CONFIRM: [
160017
- { target: "final", actions: ["rename"] }
160004
+ { target: "check", actions: ["rename"] }
160018
160005
  ]
160019
160006
  }
160020
160007
  },
160021
- final: {
160008
+ check: {
160022
160009
  entry: (0, import_xstate2.send)({ type: "NEXT" }),
160023
160010
  on: {
160024
160011
  NEXT: [
160025
160012
  {
160026
160013
  target: "done",
160027
- cond: "isMissingColumnsResolved",
160014
+ cond: "isResolved",
160028
160015
  actions: ["resolveRemaining"]
160029
160016
  },
160030
160017
  {
@@ -160037,8 +160024,7 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
160037
160024
  }
160038
160025
  }, {
160039
160026
  guards: {
160040
- isMissingColumnsResolved: ({ deletedColumns }) => !deletedColumns.length,
160041
- isNewColumnsResolved: ({ addedColumns }) => !addedColumns.length
160027
+ isResolved: ({ deletedColumns, addedColumns }) => !deletedColumns.length || !addedColumns.length
160042
160028
  },
160043
160029
  actions: {
160044
160030
  choseItem: (0, import_xstate2.assign)({
@@ -160083,14 +160069,12 @@ var createResolveColumnsMachine = (props) => (0, import_xstate2.createMachine)({
160083
160069
  addedColumns,
160084
160070
  created
160085
160071
  }) => [...created, ...addedColumns],
160086
- addedColumns: (context) => []
160087
- }),
160088
- resolveMissing: (0, import_xstate2.assign)({
160089
160072
  deleted: ({
160090
160073
  deletedColumns,
160091
160074
  deleted
160092
160075
  }) => [...deleted, ...deletedColumns],
160093
- deletedColumns: (context) => []
160076
+ deletedColumns: (context) => [],
160077
+ addedColumns: (context) => []
160094
160078
  })
160095
160079
  }
160096
160080
  });
@@ -160983,9 +160967,9 @@ var BASE64_MAP = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789
160983
160967
  function resolveYamlBinary(data) {
160984
160968
  if (data === null)
160985
160969
  return false;
160986
- var code, idx, bitlen = 0, max = data.length, map2 = BASE64_MAP;
160987
- for (idx = 0; idx < max; idx++) {
160988
- code = map2.indexOf(data.charAt(idx));
160970
+ var code, idx2, bitlen = 0, max = data.length, map2 = BASE64_MAP;
160971
+ for (idx2 = 0; idx2 < max; idx2++) {
160972
+ code = map2.indexOf(data.charAt(idx2));
160989
160973
  if (code > 64)
160990
160974
  continue;
160991
160975
  if (code < 0)
@@ -160995,14 +160979,14 @@ function resolveYamlBinary(data) {
160995
160979
  return bitlen % 8 === 0;
160996
160980
  }
160997
160981
  function constructYamlBinary(data) {
160998
- var idx, tailbits, input = data.replace(/[\r\n=]/g, ""), max = input.length, map2 = BASE64_MAP, bits = 0, result2 = [];
160999
- for (idx = 0; idx < max; idx++) {
161000
- if (idx % 4 === 0 && idx) {
160982
+ var idx2, tailbits, input = data.replace(/[\r\n=]/g, ""), max = input.length, map2 = BASE64_MAP, bits = 0, result2 = [];
160983
+ for (idx2 = 0; idx2 < max; idx2++) {
160984
+ if (idx2 % 4 === 0 && idx2) {
161001
160985
  result2.push(bits >> 16 & 255);
161002
160986
  result2.push(bits >> 8 & 255);
161003
160987
  result2.push(bits & 255);
161004
160988
  }
161005
- bits = bits << 6 | map2.indexOf(input.charAt(idx));
160989
+ bits = bits << 6 | map2.indexOf(input.charAt(idx2));
161006
160990
  }
161007
160991
  tailbits = max % 4 * 6;
161008
160992
  if (tailbits === 0) {
@@ -161018,15 +161002,15 @@ function constructYamlBinary(data) {
161018
161002
  return new Uint8Array(result2);
161019
161003
  }
161020
161004
  function representYamlBinary(object) {
161021
- var result2 = "", bits = 0, idx, tail, max = object.length, map2 = BASE64_MAP;
161022
- for (idx = 0; idx < max; idx++) {
161023
- if (idx % 3 === 0 && idx) {
161005
+ var result2 = "", bits = 0, idx2, tail, max = object.length, map2 = BASE64_MAP;
161006
+ for (idx2 = 0; idx2 < max; idx2++) {
161007
+ if (idx2 % 3 === 0 && idx2) {
161024
161008
  result2 += map2[bits >> 18 & 63];
161025
161009
  result2 += map2[bits >> 12 & 63];
161026
161010
  result2 += map2[bits >> 6 & 63];
161027
161011
  result2 += map2[bits & 63];
161028
161012
  }
161029
- bits = (bits << 8) + object[idx];
161013
+ bits = (bits << 8) + object[idx2];
161030
161014
  }
161031
161015
  tail = max % 3;
161032
161016
  if (tail === 0) {
@@ -162997,6 +162981,7 @@ var printer = import_typescript.default.createPrinter();
162997
162981
  var prepareFabricFile = (folder) => {
162998
162982
  const staticImports = [
162999
162983
  import_typescript.default.createImportDeclaration(void 0, void 0, import_typescript.default.createImportClause(void 0, import_typescript.default.createNamespaceImport(import_typescript.default.createIdentifier("drizzle"))), import_typescript.default.createStringLiteral("drizzle-orm")),
162984
+ import_typescript.default.createImportDeclaration(void 0, void 0, import_typescript.default.createImportClause(import_typescript.default.createIdentifier("Session"), void 0), import_typescript.default.createStringLiteral("drizzle-orm/db/session")),
163000
162985
  import_typescript.default.createImportDeclaration(void 0, void 0, import_typescript.default.createImportClause(import_typescript.default.createIdentifier("MigrationSerializer"), void 0), import_typescript.default.createStringLiteral("drizzle-orm/serializer/serializer")),
163001
162986
  import_typescript.default.createImportDeclaration(void 0, void 0, import_typescript.default.createImportClause(import_typescript.default.createIdentifier("Enum"), void 0), import_typescript.default.createStringLiteral("drizzle-orm/types/type")),
163002
162987
  import_typescript.default.createImportDeclaration(void 0, void 0, import_typescript.default.createImportClause(void 0, import_typescript.default.createNamespaceImport(import_typescript.default.createIdentifier("pg"))), import_typescript.default.createStringLiteral("pg"))
@@ -163011,7 +162996,7 @@ var prepareFabricFile = (folder) => {
163011
162996
  const variablesStatements = [
163012
162997
  import_typescript.default.createVariableStatement(void 0, import_typescript.default.createVariableDeclarationList([
163013
162998
  import_typescript.default.createVariableDeclaration(import_typescript.default.createIdentifier("db"), void 0, import_typescript.default.createNew(import_typescript.default.createIdentifier("drizzle.DB"), void 0, [
163014
- import_typescript.default.createNew(import_typescript.default.createPropertyAccess(import_typescript.default.createIdentifier("pg"), import_typescript.default.createIdentifier("Pool")), void 0, [])
162999
+ import_typescript.default.createNew(import_typescript.default.createIdentifier("Session"), void 0, [import_typescript.default.createNew(import_typescript.default.createPropertyAccess(import_typescript.default.createIdentifier("pg"), import_typescript.default.createIdentifier("Pool")), void 0, [])])
163015
163000
  ]))
163016
163001
  ], import_typescript.default.NodeFlags.Const)),
163017
163002
  import_typescript.default.createVariableStatement(void 0, import_typescript.default.createVariableDeclarationList([
@@ -163293,7 +163278,8 @@ var CreateIndexConvertor = class extends Convertor {
163293
163278
  }
163294
163279
  convert(statement) {
163295
163280
  const { tableName, indexName, value } = statement;
163296
- return `CREATE INDEX IF NOT EXISTS ${indexName} ON ${tableName} (${value});`;
163281
+ const indexPart = statement.isUnique ? "UNIQUE INDEX" : "INDEX";
163282
+ return `CREATE ${indexPart} IF NOT EXISTS ${indexName} ON ${tableName} (${value});`;
163297
163283
  }
163298
163284
  };
163299
163285
  var DropIndexConvertor = class extends Convertor {
@@ -163372,7 +163358,7 @@ function diffForRenamedTables(pairs2) {
163372
163358
  return [newFrom, to];
163373
163359
  });
163374
163360
  const altered = renamed2.map((pair) => {
163375
- return diffForRenamedTable(pair.from, pair.to);
163361
+ return diffForRenamedTable(pair[0], pair[1]);
163376
163362
  });
163377
163363
  return altered;
163378
163364
  }
@@ -163396,10 +163382,10 @@ function applyJsonDiff(json1, json2) {
163396
163382
  const addedTables = tableEntries.filter((it) => it[0].includes("__added")).map((it) => it[1]).map((it) => {
163397
163383
  return __spreadProps(__spreadValues({}, it), {
163398
163384
  indexes: Object.entries(it.indexes).map((indexEntry) => {
163399
- const idx = indexEntry[1];
163400
- const name = idx["name"];
163401
- const columns = Object.values(idx["columns"]).map((it2) => it2["name"]);
163402
- return { name, columns };
163385
+ const idx2 = indexEntry[1];
163386
+ const name = idx2["name"];
163387
+ const columns = Object.values(idx2["columns"]).map((it2) => it2["name"]);
163388
+ return { name, columns, isUnique: idx2["isUnique"] };
163403
163389
  })
163404
163390
  });
163405
163391
  });
@@ -163446,22 +163432,22 @@ var findAlternationsInTable = (table) => {
163446
163432
  const deletedIndexes = Object.values(table.indexes__deleted || {}).map((it) => {
163447
163433
  const name = it["name"];
163448
163434
  const columns2 = Object.values(it["columns"]).map((it2) => it2["name"]);
163449
- return { name, columns: columns2 };
163435
+ return { name, columns: columns2, isUnique: it["isUnique"] };
163450
163436
  }).concat(Object.keys(table.indexes || {}).filter((it) => it.includes("__deleted")).map((it) => {
163451
- const idx = table.indexes[it];
163452
- const name = idx["name"];
163453
- const columns2 = Object.values(idx["columns"]).map((it2) => it2["name"]);
163454
- return { name, columns: columns2 };
163437
+ const idx2 = table.indexes[it];
163438
+ const name = idx2["name"];
163439
+ const columns2 = Object.values(idx2["columns"]).map((it2) => it2["name"]);
163440
+ return { name, columns: columns2, isUnique: idx2["isUnique"] };
163455
163441
  }));
163456
163442
  const addedIndexes = Object.values(table.indexes__added || {}).map((it) => {
163457
163443
  const name = it["name"];
163458
163444
  const columns2 = Object.values(it["columns"]).map((it2) => it2["name"]);
163459
- return { name, columns: columns2 };
163445
+ return { name, columns: columns2, isUnique: idx["isUnique"] };
163460
163446
  }).concat(Object.keys(table.indexes || {}).filter((it) => it.includes("__added")).map((it) => {
163461
- const idx = table.indexes[it];
163462
- const name = idx["name"];
163463
- const columns2 = Object.values(idx["columns"]).map((it2) => it2["name"]);
163464
- return { name, columns: columns2 };
163447
+ const idx2 = table.indexes[it];
163448
+ const name = idx2["name"];
163449
+ const columns2 = Object.values(idx2["columns"]).map((it2) => it2["name"]);
163450
+ return { name, columns: columns2, isUnique: idx2["isUnique"] };
163465
163451
  }));
163466
163452
  const mappedAltered = altered.map((it) => alternationsInColumn(it));
163467
163453
  return { name: table.name, deleted, added, altered: mappedAltered, addedIndexes, deletedIndexes };
@@ -163659,7 +163645,8 @@ var prepareCreateIndexesJson = (tableName, indexes) => {
163659
163645
  type: "create_index",
163660
163646
  tableName,
163661
163647
  indexName: index.name,
163662
- value: index.columns.join(", ")
163648
+ value: index.columns.join(", "),
163649
+ isUnique: index.isUnique
163663
163650
  };
163664
163651
  });
163665
163652
  };
@@ -163765,33 +163752,49 @@ var applySnapshotsDiff = async (json1, json2, tablesResolver, columnsResolver) =
163765
163752
  };
163766
163753
 
163767
163754
  // src/cli/commands/migrate.tsx
163768
- var migrate = async () => {
163769
- const drizzleConfig = js_yaml_default.load(import_fs4.default.readFileSync("drizzle.config.yml", { encoding: "utf-8" }));
163755
+ var prepareAndMigrate = async (config) => {
163756
+ const drizzleConfig = config != null ? config : js_yaml_default.load(import_fs4.default.readFileSync("drizzle.config.yml", { encoding: "utf-8" }));
163770
163757
  const migrationRootFolder = drizzleConfig.migrationRootFolder || "drizzle";
163771
163758
  const dataFolder = drizzleConfig.dataFolder;
163772
- const { prev, cur } = await task("Preparing data schema json snapshot", async ({ setTitle }) => {
163759
+ const { prev, cur } = await prepareJsonSnapshots(migrationRootFolder, dataFolder);
163760
+ const sql = await prepareSQL(prev, cur);
163761
+ const folderName = prepareSnapshotFolderName();
163762
+ const migrationFolderPath = `./${migrationRootFolder}/${folderName}`;
163763
+ import_fs4.default.mkdirSync(migrationFolderPath);
163764
+ import_fs4.default.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2));
163765
+ import_fs4.default.writeFileSync(`${migrationFolderPath}/migration.sql`, sql);
163766
+ };
163767
+ var prepareJsonSnapshots = async (migrationRootFolder, dataFolder) => {
163768
+ return await task("Preparing data schema json snapshot", async ({ setTitle }) => {
163773
163769
  return migrationPreparator_default(migrationRootFolder, dataFolder);
163774
163770
  });
163771
+ };
163772
+ var prepareSQL = async (prev, cur) => {
163775
163773
  const tablesResolver = async (input) => {
163776
- const { created, deleted, renamed: renamed2 } = await promptTablesConflicts({
163777
- newTables: input.created,
163778
- missingTables: input.deleted
163779
- });
163780
- return { created, deleted, renamed: renamed2 };
163774
+ try {
163775
+ const { created, deleted, renamed: renamed2 } = await promptTablesConflicts({
163776
+ newTables: input.created,
163777
+ missingTables: input.deleted
163778
+ });
163779
+ return { created, deleted, renamed: renamed2 };
163780
+ } catch (e) {
163781
+ console.error(e);
163782
+ throw e;
163783
+ }
163781
163784
  };
163782
163785
  const columnsResolver = async (input) => {
163783
163786
  const result2 = await promptColumnsConflicts({ name: input.tableName, added: input.created, deleted: input.deleted });
163784
- return { tableName: input.tableName, created: result2.created, deleted: input.deleted, renamed: result2.renamed };
163787
+ return { tableName: input.tableName, created: result2.created, deleted: result2.deleted, renamed: result2.renamed };
163785
163788
  };
163786
- const sql = await applySnapshotsDiff(prev, cur, tablesResolver, columnsResolver);
163787
- const date = new Date();
163788
- const folderName = date.toISOString();
163789
- const migrationFolderPath = `./${migrationRootFolder}/${folderName}`;
163790
- import_fs4.default.mkdirSync(migrationFolderPath);
163791
- import_fs4.default.writeFileSync(`${migrationFolderPath}/snapshot.json`, JSON.stringify(cur, null, 2));
163792
- import_fs4.default.writeFileSync(`${migrationFolderPath}/migration.sql`, sql);
163789
+ return await applySnapshotsDiff(prev, cur, tablesResolver, columnsResolver);
163790
+ };
163791
+ var prepareSnapshotFolderName = () => {
163792
+ const now = new Date();
163793
+ return `${now.getFullYear()}${two(now.getUTCMonth() + 1)}${two(now.getUTCDate())}${two(now.getUTCHours())}${two(now.getUTCMinutes())}${two(now.getUTCSeconds())}`;
163794
+ };
163795
+ var two = (input) => {
163796
+ return input.toString().padStart(2, "0");
163793
163797
  };
163794
- var migrate_default = migrate;
163795
163798
 
163796
163799
  // node_modules/source-map-support/register.js
163797
163800
  require_source_map_support().install();
@@ -163799,19 +163802,9 @@ require_source_map_support().install();
163799
163802
  // node_modules/pretty-error/start.js
163800
163803
  require_PrettyError().start();
163801
163804
 
163802
- // src/cli/commands/prepare-snapshot.ts
163803
- function prepareSnapshot(path2) {
163804
- const result2 = serializer_default(path2);
163805
- return result2;
163806
- }
163807
-
163808
163805
  // src/cli/index.tsx
163809
- var migrationCommand = new import_commander.Command("migrate").alias("mg").description("Migration").action(migrate_default);
163810
- var prepareSnapshotCommand = new import_commander.Command("prepare").argument("<path>").action((path2) => {
163811
- console.log(JSON.stringify(prepareSnapshot(path2), null, 2));
163812
- });
163806
+ var migrationCommand = new import_commander.Command("migrate").alias("mg").description("Migration").action(prepareAndMigrate);
163813
163807
  import_commander.program.addCommand(migrationCommand);
163814
- import_commander.program.addCommand(prepareSnapshotCommand);
163815
163808
  import_commander.program.parse();
163816
163809
  /*! *****************************************************************************
163817
163810
  Copyright (c) Microsoft Corporation.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "drizzle-kit",
3
- "version": "0.9.23",
3
+ "version": "0.9.27",
4
4
  "main": "index.js",
5
5
  "repository": "https://github.com/lambda-direct/drizzle-kit",
6
6
  "author": "Alex Blokh <aleksandrblokh@gmail.com>",
@@ -12,7 +12,8 @@
12
12
  "start": "ts-node ./src/index.ts",
13
13
  "watch": "esbuild ./src/cli/index.tsx --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --watch",
14
14
  "diff": "ts-node ./src/diff.ts",
15
- "test": "ts-node ./index.ts",
15
+ "sim": "ts-node ./dev/simulate.ts",
16
+ "test": "jest --silent",
16
17
  "imports": "ts-node ./test.ts",
17
18
  "build": "esbuild ./src/cli/index.tsx --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild"
18
19
  },
@@ -29,29 +30,17 @@
29
30
  "xstate": "^4.25.0"
30
31
  },
31
32
  "devDependencies": {
32
- "@types/ink-divider": "^2.0.2",
33
+ "@types/jest": "^27.0.3",
33
34
  "@types/js-yaml": "^4.0.3",
34
- "@types/lodash.flatten": "^4.4.6",
35
- "@types/object-hash": "2.1.1",
36
35
  "@types/pg": "^8.6.1",
37
- "@types/react": "^17.0.13",
38
- "@types/vorpal": "^1.12.1",
39
- "@types/webpack": "^5.28.0",
40
36
  "@typescript-eslint/eslint-plugin": "4.4.1",
41
- "drizzle-orm": "^0.9.12",
37
+ "drizzle-orm": "^0.10.2",
42
38
  "eslint": "^7.2.0",
43
39
  "eslint-config-airbnb": "18.2.1",
44
40
  "eslint-config-airbnb-typescript": "11.0.0",
45
41
  "eslint-plugin-import": "^2.22.1",
46
- "eslint-plugin-jsx-a11y": "^6.4.1",
47
- "eslint-plugin-react": "^7.21.5",
48
- "eslint-plugin-react-hooks": "^1.7.0",
49
- "prettier": "^2.3.2",
42
+ "jest": "^27.4.5",
50
43
  "source-map-loader": "^3.0.0",
51
- "tsconfig-paths-webpack-plugin": "^3.5.1",
52
- "webpack": "^5.42.0",
53
- "webpack-cli": "^4.7.2",
54
- "webpack-node-externals": "^3.0.0",
55
- "webpack-shebang-plugin": "^1.1.6"
44
+ "ts-jest": "^27.1.2"
56
45
  }
57
46
  }