drizzle-kit 0.14.0 → 0.14.2

package/index.js

@@ -7402,6 +7402,7 @@ var init_pgSerializer = __esm({
         (0, import_utils.getTableColumns)(table4).forEach((column4) => {
           const notNull = column4.notNull;
           const primaryKey = column4.primary;
+          const sqlTypeLowered = column4.getSQLType().toLowerCase();
           const columnToSet = {
             name: column4.name,
             type: column4.getSQLType(),
@@ -7417,7 +7418,15 @@ var init_pgSerializer = __esm({
                 throw new Error("Only strings are allowed in .default()");
               }).join();
             } else {
-              columnToSet.default = typeof column4.default === "string" ? `'${column4.default}'` : column4.default;
+              if (typeof column4.default === "string") {
+                columnToSet.default = `'${column4.default}'`;
+              } else {
+                if (sqlTypeLowered === "jsonb" || sqlTypeLowered === "json") {
+                  columnToSet.default = `'${JSON.stringify(column4.default)}'::${sqlTypeLowered}`;
+                } else {
+                  columnToSet.default = column4.default;
+                }
+              }
             }
           }
           columnsObject[column4.name] = columnToSet;
@@ -13848,9 +13857,9 @@ var require_lib = __commonJS({
   }
 });
 
-// node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/readline.js
+// node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/readline.js
 var require_readline = __commonJS({
-  "node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/readline.js"(exports) {
+  "node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/readline.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.prepareReadLine = void 0;
@@ -13934,9 +13943,9 @@ var require_src2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/utils.js
+// node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/utils.js
 var require_utils = __commonJS({
-  "node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/utils.js"(exports) {
+  "node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/utils.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.clear = void 0;
@@ -14112,15 +14121,42 @@ var require_lodash = __commonJS({
   }
 });
 
-// node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/index.js
+// node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/index.js
 var require_hanji = __commonJS({
-  "node_modules/.pnpm/hanji@0.0.3/node_modules/hanji/index.js"(exports) {
+  "node_modules/.pnpm/hanji@0.0.4/node_modules/hanji/index.js"(exports) {
     "use strict";
+    var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
+      function adopt(value) {
+        return value instanceof P ? value : new P(function(resolve) {
+          resolve(value);
+        });
+      }
+      return new (P || (P = Promise))(function(resolve, reject) {
+        function fulfilled(value) {
+          try {
+            step(generator.next(value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function rejected(value) {
+          try {
+            step(generator["throw"](value));
+          } catch (e) {
+            reject(e);
+          }
+        }
+        function step(result) {
+          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+        }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+    };
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.onTerminate = exports.render = exports.Terminal = exports.deferred = exports.SelectState = exports.Prompt = void 0;
+    exports.onTerminate = exports.renderWithTask = exports.render = exports.TaskTerminal = exports.TaskView = exports.Terminal = exports.deferred = exports.SelectState = exports.Prompt = void 0;
     var readline_1 = require_readline();
     var sisteransi_1 = require_src2();
     var utils_1 = require_utils();
@@ -14274,6 +14310,51 @@ var require_hanji = __commonJS({
       }
     };
     exports.Terminal = Terminal;
+    var TaskView = class {
+      constructor() {
+        this.attachCallbacks = [];
+        this.detachCallbacks = [];
+      }
+      requestLayout() {
+        this.terminal.requestLayout();
+      }
+      attach(terminal) {
+        this.terminal = terminal;
+        this.attachCallbacks.forEach((it) => it(terminal));
+      }
+      detach(terminal) {
+        this.detachCallbacks.forEach((it) => it(terminal));
+        this.terminal = void 0;
+      }
+      on(type, callback) {
+        if (type === "attach") {
+          this.attachCallbacks.push(callback);
+        } else if (type === "detach") {
+          this.detachCallbacks.push(callback);
+        }
+      }
+    };
+    exports.TaskView = TaskView;
+    var TaskTerminal = class {
+      constructor(view, stdout) {
+        this.view = view;
+        this.stdout = stdout;
+        this.text = "";
+        this.view.attach(this);
+      }
+      requestLayout() {
+        const string = this.view.render();
+        const clearPrefix = this.text ? (0, utils_1.clear)(this.text, this.stdout.columns) : "";
+        this.text = string;
+        this.stdout.write(`${clearPrefix}${string}`);
+      }
+      clear() {
+        this.view.detach(this);
+        const clearPrefix = this.text ? (0, utils_1.clear)(this.text, this.stdout.columns) : "";
+        this.stdout.write(`${clearPrefix}`);
+      }
+    };
+    exports.TaskTerminal = TaskTerminal;
     function render4(view) {
       const { stdin, stdout, closable } = (0, readline_1.prepareReadLine)();
       if (view instanceof Prompt2) {
@@ -14283,9 +14364,20 @@ var require_hanji = __commonJS({
       }
       stdout.write(`${view}
 `);
+      closable.close();
       return;
     }
     exports.render = render4;
+    function renderWithTask(view, task) {
+      return __awaiter(this, void 0, void 0, function* () {
+        const terminal = new TaskTerminal(view, process.stdout);
+        terminal.requestLayout();
+        const result = yield task;
+        terminal.clear();
+        return result;
+      });
+    }
+    exports.renderWithTask = renderWithTask;
     var terminateHandler;
     function onTerminate(callback) {
       terminateHandler = callback;
@@ -17891,16 +17983,16 @@ var SQLiteCreateTableConvertor = class extends Convertor {
   convert(st) {
     const { tableName, columns, referenceData } = st;
     let statement = "";
-    statement += `CREATE TABLE ${tableName} (
-`;
+    statement += `CREATE TABLE ${tableName} (`;
     for (let i = 0; i < columns.length; i++) {
       const column4 = columns[i];
       const primaryKeyStatement = column4.primaryKey ? "PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? "NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? `DEFAULT ${column4.default}` : "";
       const autoincrementStatement = column4.autoincrement ? "AUTO_INCREMENT" : "";
-      statement += "	" + `\`${column4.name}\` ${column4.type} ${autoincrementStatement} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
-      statement += (i === columns.length - 1 ? referenceData.length > 0 ? "," : "" : ",") + "\n";
+      statement += "\n	";
+      statement += `\`${column4.name}\` ${column4.type} ${autoincrementStatement} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.squashSpaces();
+      statement += ",";
     }
     for (let i = 0; i < referenceData.length; i++) {
       const referenceAsString = referenceData[i];
@@ -17917,9 +18009,13 @@ var SQLiteCreateTableConvertor = class extends Convertor {
       const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
       const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
       const toColumnsString = columnsTo.map((it) => `\`${it}\``).join(",");
-      statement += "	" + `FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onUpdateStatement} ${onDeleteStatement}`.replace(/  +/g, " ").trim();
-      statement += (i === columns.length - 1 ? "" : ",") + "\n";
+      statement += "\n	";
+      statement += `FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onUpdateStatement} ${onDeleteStatement}`.squashSpaces();
+      statement += ",";
     }
+    statement.trimChar(",");
+    statement += `
+`;
     statement += `);`;
     statement += `
 `;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "drizzle-kit",
-  "version": "0.14.0",
-  "repository": "https://github.com/lambda-direct/drizzle-kit",
+  "version": "0.14.2",
+  "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
   "bin": {