drizzle-kit 0.24.2-cf2bc48 → 0.24.2-d496e6f

package/index.d.mts

@@ -1,9 +1,11 @@
 import { ConnectionOptions } from 'tls';
 
-declare const drivers: readonly ["turso", "d1-http", "expo", "aws-data-api", "pglite"];
+declare const prefixes: readonly ["index", "timestamp", "supabase", "unix", "none"];
+type Prefix = (typeof prefixes)[number];
+declare const drivers: readonly ["d1-http", "expo", "aws-data-api", "pglite"];
 type Driver = (typeof drivers)[number];
 
-declare const dialects: readonly ["postgresql", "mysql", "sqlite"];
+declare const dialects: readonly ["postgresql", "mysql", "sqlite", "turso"];
 type Dialect = (typeof dialects)[number];
 
 type SslOptions = {
@@ -120,13 +122,20 @@ type Config = {
     migrations?: {
         table?: string;
         schema?: string;
+        prefix?: Prefix;
     };
     introspect?: {
         casing: 'camel' | 'preserve';
     };
+    entities?: {
+        roles?: boolean | {
+            provider?: string;
+            exclude?: string[];
+            include?: string[];
+        }[];
+    };
 } & ({
-    dialect: Verify<Dialect, 'sqlite'>;
-    driver: Verify<Driver, 'turso'>;
+    dialect: Verify<Dialect, 'turso'>;
     dbCredentials: {
         url: string;
         authToken?: string;

package/index.d.ts

@@ -1,9 +1,11 @@
 import { ConnectionOptions } from 'tls';
 
-declare const drivers: readonly ["turso", "d1-http", "expo", "aws-data-api", "pglite"];
+declare const prefixes: readonly ["index", "timestamp", "supabase", "unix", "none"];
+type Prefix = (typeof prefixes)[number];
+declare const drivers: readonly ["d1-http", "expo", "aws-data-api", "pglite"];
 type Driver = (typeof drivers)[number];
 
-declare const dialects: readonly ["postgresql", "mysql", "sqlite"];
+declare const dialects: readonly ["postgresql", "mysql", "sqlite", "turso"];
 type Dialect = (typeof dialects)[number];
 
 type SslOptions = {
@@ -120,13 +122,20 @@ type Config = {
     migrations?: {
         table?: string;
         schema?: string;
+        prefix?: Prefix;
     };
     introspect?: {
         casing: 'camel' | 'preserve';
     };
+    entities?: {
+        roles?: boolean | {
+            provider?: string;
+            exclude?: string[];
+            include?: string[];
+        }[];
+    };
 } & ({
-    dialect: Verify<Dialect, 'sqlite'>;
-    driver: Verify<Driver, 'turso'>;
+    dialect: Verify<Dialect, 'turso'>;
     dbCredentials: {
         url: string;
         authToken?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.24.2-cf2bc48",
+	"version": "0.24.2-d496e6f",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",
@@ -39,7 +39,6 @@
 		"build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
 		"pack": "cp package.json README.md dist/ && (cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
 		"tsc": "tsc -p tsconfig.build.json",
-		"types": "tsc --noEmit",
 		"publish": "npm publish package.tgz"
 	},
 	"dependencies": {
@@ -52,10 +51,10 @@
 		"@arethetypeswrong/cli": "^0.15.3",
 		"@aws-sdk/client-rds-data": "^3.556.0",
 		"@cloudflare/workers-types": "^4.20230518.0",
-		"@electric-sql/pglite": "^0.1.5",
+		"@electric-sql/pglite": "^0.2.5",
 		"@hono/node-server": "^1.9.0",
 		"@hono/zod-validator": "^0.2.1",
-		"@libsql/client": "^0.4.2",
+		"@libsql/client": "^0.10.0",
 		"@neondatabase/serverless": "^0.9.1",
 		"@originjs/vite-plugin-commonjs": "^1.0.3",
 		"@planetscale/database": "^1.16.0",
@@ -75,6 +74,7 @@
 		"@vercel/postgres": "^0.8.0",
 		"ava": "^5.1.0",
 		"better-sqlite3": "^9.4.3",
+		"bun-types": "^0.6.6",
 		"camelcase": "^7.0.1",
 		"chalk": "^5.2.0",
 		"commander": "^12.1.0",

package/utils.js

@@ -564,9 +564,11 @@ var require_hanji = __commonJS({
 // src/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  assertV3OutFolder: () => assertV3OutFolder,
+  assertV1OutFolder: () => assertV1OutFolder,
   columnRenameKey: () => columnRenameKey,
   copy: () => copy,
+  dryJournal: () => dryJournal,
+  findAddedAndRemoved: () => findAddedAndRemoved,
   isPgArrayType: () => isPgArrayType,
   kloudMeta: () => kloudMeta,
   normalisePGliteUrl: () => normalisePGliteUrl,
@@ -5145,6 +5147,12 @@ var sequenceSchema = objectType({
   cycle: booleanType().optional(),
   schema: stringType()
 }).strict();
+var roleSchema = objectType({
+  name: stringType(),
+  createDb: booleanType().optional(),
+  createRole: booleanType().optional(),
+  inherit: booleanType().optional()
+}).strict();
 var sequenceSquashed = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5208,6 +5216,14 @@ var uniqueConstraint2 = objectType({
   columns: stringType().array(),
   nullsNotDistinct: booleanType()
 }).strict();
+var policy = objectType({
+  name: stringType(),
+  as: enumType(["PERMISSIVE", "RESTRICTIVE"]).optional(),
+  for: enumType(["ALL", "SELECT", "INSERT", "UPDATE", "DELETE"]).optional(),
+  to: stringType().array().optional(),
+  using: stringType().optional(),
+  withCheck: stringType().optional()
+}).strict();
 var tableV42 = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5249,7 +5265,8 @@ var table2 = objectType({
   indexes: recordType(stringType(), index2),
   foreignKeys: recordType(stringType(), fk2),
   compositePrimaryKeys: recordType(stringType(), compositePK2),
-  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({}),
+  policies: recordType(stringType(), policy).default({})
 }).strict();
 var schemaHash2 = objectType({
   id: stringType(),
@@ -5343,6 +5360,7 @@ var pgSchemaInternal = objectType({
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType()),
   sequences: recordType(stringType(), sequenceSchema).default({}),
+  roles: recordType(stringType(), roleSchema).default({}),
   _meta: objectType({
     schemas: recordType(stringType(), stringType()),
     tables: recordType(stringType(), stringType()),
@@ -5357,7 +5375,8 @@ var tableSquashed2 = objectType({
   indexes: recordType(stringType(), stringType()),
   foreignKeys: recordType(stringType(), stringType()),
   compositePrimaryKeys: recordType(stringType(), stringType()),
-  uniqueConstraints: recordType(stringType(), stringType())
+  uniqueConstraints: recordType(stringType(), stringType()),
+  policies: recordType(stringType(), stringType())
 }).strict();
 var tableSquashedV42 = objectType({
   name: stringType(),
@@ -5386,7 +5405,8 @@ var pgSchemaSquashed = objectType({
   tables: recordType(stringType(), tableSquashed2),
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType()),
-  sequences: recordType(stringType(), sequenceSquashed)
+  sequences: recordType(stringType(), sequenceSquashed),
+  roles: recordType(stringType(), roleSchema).default({})
 }).strict();
 var pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
 var pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
@@ -5555,25 +5575,39 @@ var copy = (it) => {
 var objectValues = (obj) => {
   return Object.values(obj);
 };
-var assertV3OutFolder = (out) => {
+var assertV1OutFolder = (out) => {
   if (!(0, import_fs.existsSync)(out))
     return;
-  if (!(0, import_fs.existsSync)((0, import_path.join)(out, "meta")))
-    return;
-  console.log(
-    `Your migrations folder format is outdated, please run ${source_default.green.bold(
-      `drizzle-kit up`
-    )}`
+  const oldMigrationFolders = (0, import_fs.readdirSync)(out).filter(
+    (it) => it.length === 14 && /^\d+$/.test(it)
   );
-  process.exit(1);
+  if (oldMigrationFolders.length > 0) {
+    console.log(
+      `Your migrations folder format is outdated, please run ${source_default.green.bold(
+        `drizzle-kit up`
+      )}`
+    );
+    process.exit(1);
+  }
+};
+var dryJournal = (dialect3) => {
+  return {
+    version: snapshotVersion,
+    dialect: dialect3,
+    entries: []
+  };
 };
 var prepareOutFolder = (out, dialect3) => {
-  (0, import_fs.mkdirSync)(out, { recursive: true });
-  const snapshots = (0, import_fs.readdirSync)(out).filter((it) => (0, import_fs.lstatSync)((0, import_path.join)(out, it)).isDirectory()).map(
-    (it) => (0, import_path.join)(out, it, "snapshot.json")
-  );
+  const meta = (0, import_path.join)(out, "meta");
+  const journalPath = (0, import_path.join)(meta, "_journal.json");
+  if (!(0, import_fs.existsSync)((0, import_path.join)(out, "meta"))) {
+    (0, import_fs.mkdirSync)(meta, { recursive: true });
+    (0, import_fs.writeFileSync)(journalPath, JSON.stringify(dryJournal(dialect3)));
+  }
+  const journal = JSON.parse((0, import_fs.readFileSync)(journalPath).toString());
+  const snapshots = (0, import_fs.readdirSync)(meta).filter((it) => !it.startsWith("_")).map((it) => (0, import_path.join)(meta, it));
   snapshots.sort();
-  return snapshots;
+  return { meta, snapshots, journal };
 };
 var validatorForDialect = (dialect3) => {
   switch (dialect3) {
@@ -5581,6 +5615,8 @@ var validatorForDialect = (dialect3) => {
       return { validator: backwardCompatiblePgSchema, version: 7 };
     case "sqlite":
       return { validator: backwardCompatibleSqliteSchema, version: 6 };
+    case "turso":
+      return { validator: backwardCompatibleSqliteSchema, version: 6 };
     case "mysql":
       return { validator: backwardCompatibleMysqlSchema, version: 5 };
   }
@@ -5628,7 +5664,7 @@ var validateWithReport = (snapshots, dialect3) => {
   return result;
 };
 var prepareMigrationFolder = (outFolder = "drizzle", dialect3) => {
-  const snapshots = prepareOutFolder(outFolder, dialect3);
+  const { snapshots, journal } = prepareOutFolder(outFolder, dialect3);
   const report = validateWithReport(snapshots, dialect3);
   if (report.nonLatest.length > 0) {
     console.log(
@@ -5660,7 +5696,7 @@ var prepareMigrationFolder = (outFolder = "drizzle", dialect3) => {
   if (abort) {
     process.exit(0);
   }
-  return snapshots;
+  return { snapshots, journal };
 };
 var prepareMigrationMeta = (schemas, tables, columns) => {
   const _meta = {
@@ -5735,11 +5771,20 @@ var normalisePGliteUrl = (it) => {
 function isPgArrayType(sqlType) {
   return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
 }
+function findAddedAndRemoved(columnNames1, columnNames2) {
+  const set1 = new Set(columnNames1);
+  const set2 = new Set(columnNames2);
+  const addedColumns = columnNames2.filter((it) => !set1.has(it));
+  const removedColumns = columnNames1.filter((it) => !set2.has(it));
+  return { addedColumns, removedColumns };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  assertV3OutFolder,
+  assertV1OutFolder,
   columnRenameKey,
   copy,
+  dryJournal,
+  findAddedAndRemoved,
   isPgArrayType,
   kloudMeta,
   normalisePGliteUrl,

package/utils.mjs

@@ -1052,7 +1052,7 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/utils.ts
-import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync } from "fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
 import { parse } from "url";
 
@@ -5126,6 +5126,12 @@ var sequenceSchema = objectType({
   cycle: booleanType().optional(),
   schema: stringType()
 }).strict();
+var roleSchema = objectType({
+  name: stringType(),
+  createDb: booleanType().optional(),
+  createRole: booleanType().optional(),
+  inherit: booleanType().optional()
+}).strict();
 var sequenceSquashed = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5189,6 +5195,14 @@ var uniqueConstraint2 = objectType({
   columns: stringType().array(),
   nullsNotDistinct: booleanType()
 }).strict();
+var policy = objectType({
+  name: stringType(),
+  as: enumType(["PERMISSIVE", "RESTRICTIVE"]).optional(),
+  for: enumType(["ALL", "SELECT", "INSERT", "UPDATE", "DELETE"]).optional(),
+  to: stringType().array().optional(),
+  using: stringType().optional(),
+  withCheck: stringType().optional()
+}).strict();
 var tableV42 = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5230,7 +5244,8 @@ var table2 = objectType({
   indexes: recordType(stringType(), index2),
   foreignKeys: recordType(stringType(), fk2),
   compositePrimaryKeys: recordType(stringType(), compositePK2),
-  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({}),
+  policies: recordType(stringType(), policy).default({})
 }).strict();
 var schemaHash2 = objectType({
   id: stringType(),
@@ -5324,6 +5339,7 @@ var pgSchemaInternal = objectType({
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType()),
   sequences: recordType(stringType(), sequenceSchema).default({}),
+  roles: recordType(stringType(), roleSchema).default({}),
   _meta: objectType({
     schemas: recordType(stringType(), stringType()),
     tables: recordType(stringType(), stringType()),
@@ -5338,7 +5354,8 @@ var tableSquashed2 = objectType({
   indexes: recordType(stringType(), stringType()),
   foreignKeys: recordType(stringType(), stringType()),
   compositePrimaryKeys: recordType(stringType(), stringType()),
-  uniqueConstraints: recordType(stringType(), stringType())
+  uniqueConstraints: recordType(stringType(), stringType()),
+  policies: recordType(stringType(), stringType())
 }).strict();
 var tableSquashedV42 = objectType({
   name: stringType(),
@@ -5367,7 +5384,8 @@ var pgSchemaSquashed = objectType({
   tables: recordType(stringType(), tableSquashed2),
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType()),
-  sequences: recordType(stringType(), sequenceSquashed)
+  sequences: recordType(stringType(), sequenceSquashed),
+  roles: recordType(stringType(), roleSchema).default({})
 }).strict();
 var pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
 var pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
@@ -5536,25 +5554,39 @@ var copy = (it) => {
 var objectValues = (obj) => {
   return Object.values(obj);
 };
-var assertV3OutFolder = (out) => {
+var assertV1OutFolder = (out) => {
   if (!existsSync(out))
     return;
-  if (!existsSync(join(out, "meta")))
-    return;
-  console.log(
-    `Your migrations folder format is outdated, please run ${source_default.green.bold(
-      `drizzle-kit up`
-    )}`
+  const oldMigrationFolders = readdirSync(out).filter(
+    (it) => it.length === 14 && /^\d+$/.test(it)
   );
-  process.exit(1);
+  if (oldMigrationFolders.length > 0) {
+    console.log(
+      `Your migrations folder format is outdated, please run ${source_default.green.bold(
+        `drizzle-kit up`
+      )}`
+    );
+    process.exit(1);
+  }
+};
+var dryJournal = (dialect3) => {
+  return {
+    version: snapshotVersion,
+    dialect: dialect3,
+    entries: []
+  };
 };
 var prepareOutFolder = (out, dialect3) => {
-  mkdirSync(out, { recursive: true });
-  const snapshots = readdirSync(out).filter((it) => lstatSync(join(out, it)).isDirectory()).map(
-    (it) => join(out, it, "snapshot.json")
-  );
+  const meta = join(out, "meta");
+  const journalPath = join(meta, "_journal.json");
+  if (!existsSync(join(out, "meta"))) {
+    mkdirSync(meta, { recursive: true });
+    writeFileSync(journalPath, JSON.stringify(dryJournal(dialect3)));
+  }
+  const journal = JSON.parse(readFileSync(journalPath).toString());
+  const snapshots = readdirSync(meta).filter((it) => !it.startsWith("_")).map((it) => join(meta, it));
   snapshots.sort();
-  return snapshots;
+  return { meta, snapshots, journal };
 };
 var validatorForDialect = (dialect3) => {
   switch (dialect3) {
@@ -5562,6 +5594,8 @@ var validatorForDialect = (dialect3) => {
       return { validator: backwardCompatiblePgSchema, version: 7 };
     case "sqlite":
       return { validator: backwardCompatibleSqliteSchema, version: 6 };
+    case "turso":
+      return { validator: backwardCompatibleSqliteSchema, version: 6 };
     case "mysql":
       return { validator: backwardCompatibleMysqlSchema, version: 5 };
   }
@@ -5609,7 +5643,7 @@ var validateWithReport = (snapshots, dialect3) => {
   return result;
 };
 var prepareMigrationFolder = (outFolder = "drizzle", dialect3) => {
-  const snapshots = prepareOutFolder(outFolder, dialect3);
+  const { snapshots, journal } = prepareOutFolder(outFolder, dialect3);
   const report = validateWithReport(snapshots, dialect3);
   if (report.nonLatest.length > 0) {
     console.log(
@@ -5641,7 +5675,7 @@ var prepareMigrationFolder = (outFolder = "drizzle", dialect3) => {
   if (abort) {
     process.exit(0);
   }
-  return snapshots;
+  return { snapshots, journal };
 };
 var prepareMigrationMeta = (schemas, tables, columns) => {
   const _meta = {
@@ -5716,10 +5750,19 @@ var normalisePGliteUrl = (it) => {
 function isPgArrayType(sqlType) {
   return sqlType.match(/.*\[\d*\].*|.*\[\].*/g) !== null;
 }
+function findAddedAndRemoved(columnNames1, columnNames2) {
+  const set1 = new Set(columnNames1);
+  const set2 = new Set(columnNames2);
+  const addedColumns = columnNames2.filter((it) => !set1.has(it));
+  const removedColumns = columnNames1.filter((it) => !set2.has(it));
+  return { addedColumns, removedColumns };
+}
 export {
-  assertV3OutFolder,
+  assertV1OutFolder,
   columnRenameKey,
   copy,
+  dryJournal,
+  findAddedAndRemoved,
   isPgArrayType,
   kloudMeta,
   normalisePGliteUrl,