drizzle-kit 0.12.16 → 0.12.18

package/index.js

@@ -7342,20 +7342,16 @@ var require_node2 = __commonJS({
   }
 });
 
-// src/serializer/imports.ts
-var imports_exports = {};
-__export(imports_exports, {
-  prepareFromImports: () => prepareFromImports,
-  prepareFromMySqlImports: () => prepareFromMySqlImports,
-  prepareFromSqliteImports: () => prepareFromSqliteImports
+// src/serializer/pgImports.ts
+var pgImports_exports = {};
+__export(pgImports_exports, {
+  prepareFromPgImports: () => prepareFromPgImports
 });
-var import_drizzle_orm_mysql, import_drizzle_orm_pg, import_drizzle_orm_sqlite, prepareFromImports, prepareFromMySqlImports, prepareFromSqliteImports;
-var init_imports = __esm({
-  "src/serializer/imports.ts"() {
-    import_drizzle_orm_mysql = require("drizzle-orm-mysql");
+var import_drizzle_orm_pg, prepareFromPgImports;
+var init_pgImports = __esm({
+  "src/serializer/pgImports.ts"() {
     import_drizzle_orm_pg = require("drizzle-orm-pg");
-    import_drizzle_orm_sqlite = require("drizzle-orm-sqlite");
-    prepareFromImports = (imports) => {
+    prepareFromPgImports = (imports) => {
       const tables = [];
       const enums = [];
       imports.forEach((it) => {
@@ -7375,36 +7371,6 @@ var init_imports = __esm({
       });
       return { tables, enums };
     };
-    prepareFromMySqlImports = (imports) => {
-      const tables = [];
-      const enums = [];
-      imports.forEach((it) => {
-        const i0 = require(it);
-        const i0values = Object.values(i0);
-        i0values.forEach((t) => {
-          if (t instanceof import_drizzle_orm_mysql.MySqlTable) {
-            tables.push(
-              t
-            );
-          }
-        });
-      });
-      return { tables, enums };
-    };
-    prepareFromSqliteImports = (imports) => {
-      const tables = [];
-      const enums = [];
-      imports.forEach((it) => {
-        const i0 = require(it);
-        const i0values = Object.values(i0);
-        i0values.forEach((t) => {
-          if (t instanceof import_drizzle_orm_sqlite.SQLiteTable) {
-            tables.push(t);
-          }
-        });
-      });
-      return { tables, enums };
-    };
   }
 });
 
@@ -7503,6 +7469,32 @@ var init_pgSerializer = __esm({
   }
 });
 
+// src/serializer/sqliteImports.ts
+var sqliteImports_exports = {};
+__export(sqliteImports_exports, {
+  prepareFromSqliteImports: () => prepareFromSqliteImports
+});
+var import_drizzle_orm_sqlite, prepareFromSqliteImports;
+var init_sqliteImports = __esm({
+  "src/serializer/sqliteImports.ts"() {
+    import_drizzle_orm_sqlite = require("drizzle-orm-sqlite");
+    prepareFromSqliteImports = (imports) => {
+      const tables = [];
+      const enums = [];
+      imports.forEach((it) => {
+        const i0 = require(it);
+        const i0values = Object.values(i0);
+        i0values.forEach((t) => {
+          if (t instanceof import_drizzle_orm_sqlite.SQLiteTable) {
+            tables.push(t);
+          }
+        });
+      });
+      return { tables, enums };
+    };
+  }
+});
+
 // src/serializer/sqliteSerializer.ts
 var sqliteSerializer_exports = {};
 __export(sqliteSerializer_exports, {
@@ -17339,23 +17331,24 @@ var serialize = (path3, dialect5) => {
   const fileName = import_fs.default.lstatSync(path3).isDirectory() ? null : import_path.default.resolve(path3);
   const filenames = fileName ? [fileName] : import_fs.default.readdirSync(path3).map((it) => import_path.default.join(import_path.default.resolve(path3), it));
   const { unregister } = (0, import_node.register)({
-    target: "node10.4",
+    target: "node14",
     loader: "ts"
   });
   if (dialect5 === "pg") {
-    const { prepareFromImports: prepareFromImports2 } = (init_imports(), __toCommonJS(imports_exports));
+    const { prepareFromPgImports: prepareFromPgImports2 } = (init_pgImports(), __toCommonJS(pgImports_exports));
     const { generatePgSnapshot: generatePgSnapshot2 } = (init_pgSerializer(), __toCommonJS(pgSerializer_exports));
-    const { tables, enums } = prepareFromImports2(filenames);
+    const { tables, enums } = prepareFromPgImports2(filenames);
     unregister();
     return generatePgSnapshot2(tables, enums);
   } else if (dialect5 === "mysql") {
+    unregister();
     return {};
   } else if (dialect5 === "sqlite") {
-    const { prepareFromSqliteImports: prepareFromSqliteImports2 } = (init_imports(), __toCommonJS(imports_exports));
+    const { prepareFromSqliteImports: prepareFromSqliteImports2 } = (init_sqliteImports(), __toCommonJS(sqliteImports_exports));
     const { generateSqliteSnapshot: generateSqliteSnapshot2 } = (init_sqliteSerializer(), __toCommonJS(sqliteSerializer_exports));
     const { tables, enums } = prepareFromSqliteImports2(filenames);
-    const result = generateSqliteSnapshot2(tables, enums);
     unregister();
+    const result = generateSqliteSnapshot2(tables, enums);
     return result;
   } else {
     return {};
@@ -17419,7 +17412,6 @@ var SQLiteCreateTableConvertor = class extends Convertor {
   }
   convert(st) {
     const { tableName, columns, referenceData } = st;
-    const referencesAsString = referenceData.map((it) => it.data);
     let statement = "";
     statement += `CREATE TABLE ${tableName} (
 `;
@@ -17430,10 +17422,10 @@ var SQLiteCreateTableConvertor = class extends Convertor {
       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 ? referencesAsString.length > 0 ? "," : "" : ",") + "\n";
+      statement += (i === columns.length - 1 ? referenceData.length > 0 ? "," : "" : ",") + "\n";
     }
-    for (let i = 0; i < referencesAsString.length; i++) {
-      const referenceAsString = referencesAsString[i];
+    for (let i = 0; i < referenceData.length; i++) {
+      const referenceAsString = referenceData[i];
       const {
         name,
         tableFrom,
@@ -18150,15 +18142,7 @@ var prepareCreateTableJson = (table4) => {
 };
 var prepareSQLiteCreateTable = (table4) => {
   const { name, columns } = table4;
-  const references2 = Object.values(
-    table4.foreignKeys
-  ).map((fkData) => {
-    return {
-      type: "create_reference",
-      tableName: table4.name,
-      data: fkData
-    };
-  });
+  const references2 = Object.values(table4.foreignKeys);
   return {
     type: "sqlite_create_table",
     tableName: name,
@@ -18210,14 +18194,7 @@ var prepareAlterTableColumnsJson = (tableName, deleted, added, altered, addedFk,
   const dropColumns = _prepareDropColumns(tableName, deleted);
   const alterColumns = _prepareAlterColumns(tableName, altered);
   if (dialect5 === "sqlite") {
-    let jsonCreateFKStatements = [];
-    for (const addedFkKey of Object.keys(addedFk)) {
-      const addedFkValue = addedFk[addedFkKey];
-      jsonCreateFKStatements.push({
-        type: "create_reference",
-        data: addedFkValue
-      });
-    }
+    let jsonCreateFKStatements = Object.values(addedFk);
     const sqliteAddColumns = _prepareSQLiteAddColumns(
       tableName,
       added,
@@ -18252,7 +18229,7 @@ var _prepareAddColumns = (tableName, columns) => {
 };
 var _prepareSQLiteAddColumns = (tableName, columns, referenceData) => {
   const unsquashed = referenceData.map(
-    (addedFkValue) => SQLiteSquasher.unsquashFK(addedFkValue.data)
+    (addedFkValue) => SQLiteSquasher.unsquashFK(addedFkValue)
   );
   return columns.map((it) => {
     const columnsWithReference = unsquashed.find(
@@ -18611,10 +18588,7 @@ var applySnapshotsDiff = async (json1, json2, tablesResolver, columnsResolver, d
     return prepareCreateReferencesJson(it.name, it.foreignKeys);
   }).flat();
   const jsonReferencesForAllAlteredTables = allAltered.map((it) => {
-    const forAdded = prepareCreateReferencesJson(
-      it.name,
-      it.addedForeignKeys
-    );
+    const forAdded = dialect5 !== "sqlite" ? prepareCreateReferencesJson(it.name, it.addedForeignKeys) : [];
     const forAltered = prepareDropReferencesJson(
       it.name,
       it.deletedForeignKeys
@@ -18640,7 +18614,8 @@ var applySnapshotsDiff = async (json1, json2, tablesResolver, columnsResolver, d
   jsonStatements.push(...jsonRenameTables);
   jsonStatements.push(...jsonRenameColumnsStatements);
   jsonStatements.push(...jsonAlterTables);
-  jsonStatements.push(...jsonCreateReferences);
+  if (dialect5 !== "sqlite")
+    jsonStatements.push(...jsonCreateReferences);
   jsonStatements.push(...jsonAlterReferencesForAlteredTables);
   jsonStatements.push(...jsonCreateIndexesForCreatedTables);
   jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
@@ -19735,7 +19710,7 @@ var configSchema = objectType({
 var optionsSchema = objectType({
   schema: stringType().optional(),
   out: stringType().optional(),
-  dialect: enumType(["pg", "sqlite", "mysql"]),
+  dialect: enumType(["pg", "sqlite", "mysql"]).optional(),
   config: stringType().optional()
 }).strict();
 var migrationCommand = new Command("generate").alias("migrate").option(
@@ -19745,7 +19720,8 @@ var migrationCommand = new Command("generate").alias("migrate").option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.json by default"
 ).action(async (options) => {
-  const result = prepareGenerateConfig(optionsSchema.parse(options));
+  const oprtionsParsed = optionsSchema.parse(options);
+  const result = prepareGenerateConfig(oprtionsParsed);
   if (result instanceof Error) {
     console.error(result);
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.12.16",
+  "version": "0.12.18",
   "repository": "https://github.com/lambda-direct/drizzle-kit",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",