drizzle-kit 0.21.4 → 0.22.0-18d9643

package/utils.js

@@ -569,6 +569,7 @@ __export(utils_exports, {
   copy: () => copy,
   dryJournal: () => dryJournal,
   kloudMeta: () => kloudMeta,
+  normaliseSQLiteUrl: () => normaliseSQLiteUrl,
   objectValues: () => objectValues,
   prepareMigrationFolder: () => prepareMigrationFolder,
   prepareMigrationMeta: () => prepareMigrationMeta,
@@ -1077,7 +1078,10 @@ var info = (msg, greyMsg = "") => {
 
 // src/global.ts
 var originUUID = "00000000-0000-0000-0000-000000000000";
-var snapshotVersion = "6";
+var snapshotVersion = "7";
+function assertUnreachable(x) {
+  throw new Error("Didn't expect to get here");
+}
 
 // node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
 var util;
@@ -4910,7 +4914,16 @@ var kitInternals = objectType({
         objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
       )
     }).optional()
-  )
+  ).optional(),
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
 }).optional();
 var dialect = literalType("mysql");
 var schemaHash = objectType({
@@ -5060,10 +5073,48 @@ var pgSchemaV1 = objectType({
   tables: recordType(stringType(), tableV1),
   enums: recordType(stringType(), enumSchemaV1)
 }).strict();
+var indexColumn = objectType({
+  expression: stringType(),
+  isExpression: booleanType(),
+  asc: booleanType(),
+  nulls: stringType().optional(),
+  opclass: stringType().optional()
+});
 var index2 = objectType({
+  name: stringType(),
+  columns: indexColumn.array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), anyType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV4 = objectType({
   name: stringType(),
   columns: stringType().array(),
-  isUnique: booleanType()
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV5 = objectType({
+  name: stringType(),
+  columns: stringType().array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV6 = objectType({
+  name: stringType(),
+  columns: stringType().array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
 }).strict();
 var fk2 = objectType({
   name: stringType(),
@@ -5105,9 +5156,27 @@ var tableV42 = objectType({
   name: stringType(),
   schema: stringType(),
   columns: recordType(stringType(), column2),
-  indexes: recordType(stringType(), index2),
+  indexes: recordType(stringType(), indexV4),
   foreignKeys: recordType(stringType(), fk2)
 }).strict();
+var tableV6 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), indexV6),
+  foreignKeys: recordType(stringType(), fk2),
+  compositePrimaryKeys: recordType(stringType(), compositePK2),
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+}).strict();
+var tableV5 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), indexV5),
+  foreignKeys: recordType(stringType(), fk2),
+  compositePrimaryKeys: recordType(stringType(), compositePK2),
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+}).strict();
 var table2 = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5152,7 +5221,7 @@ var pgSchemaInternalV4 = objectType({
 var pgSchemaInternalV5 = objectType({
   version: literalType("5"),
   dialect: literalType("pg"),
-  tables: recordType(stringType(), table2),
+  tables: recordType(stringType(), tableV5),
   enums: recordType(stringType(), enumSchemaV1),
   schemas: recordType(stringType(), stringType()),
   _meta: objectType({
@@ -5162,6 +5231,19 @@ var pgSchemaInternalV5 = objectType({
   }),
   internal: kitInternals2
 }).strict();
+var pgSchemaInternalV6 = objectType({
+  version: literalType("6"),
+  dialect: literalType("postgresql"),
+  tables: recordType(stringType(), tableV6),
+  enums: recordType(stringType(), enumSchema),
+  schemas: recordType(stringType(), stringType()),
+  _meta: objectType({
+    schemas: recordType(stringType(), stringType()),
+    tables: recordType(stringType(), stringType()),
+    columns: recordType(stringType(), stringType())
+  }),
+  internal: kitInternals2
+}).strict();
 var pgSchemaExternal = objectType({
   version: literalType("5"),
   dialect: literalType("pg"),
@@ -5175,7 +5257,7 @@ var pgSchemaExternal = objectType({
   })
 }).strict();
 var pgSchemaInternal = objectType({
-  version: literalType("6"),
+  version: literalType("7"),
   dialect: literalType("postgresql"),
   tables: recordType(stringType(), table2),
   enums: recordType(stringType(), enumSchema),
@@ -5210,18 +5292,30 @@ var pgSchemaSquashedV4 = objectType({
   enums: recordType(stringType(), enumSchemaV1),
   schemas: recordType(stringType(), stringType())
 }).strict();
-var pgSchemaSquashed = objectType({
+var pgSchemaSquashedV6 = objectType({
   version: literalType("6"),
   dialect: literalType("postgresql"),
   tables: recordType(stringType(), tableSquashed2),
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType())
 }).strict();
+var pgSchemaSquashed = objectType({
+  version: literalType("7"),
+  dialect: literalType("postgresql"),
+  tables: recordType(stringType(), tableSquashed2),
+  enums: recordType(stringType(), enumSchema),
+  schemas: recordType(stringType(), stringType())
+}).strict();
 var pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
 var pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
 var pgSchemaV5 = pgSchemaInternalV5.merge(schemaHash2);
+var pgSchemaV6 = pgSchemaInternalV6.merge(schemaHash2);
 var pgSchema = pgSchemaInternal.merge(schemaHash2);
-var backwardCompatiblePgSchema = unionType([pgSchemaV5, pgSchema]);
+var backwardCompatiblePgSchema = unionType([
+  pgSchemaV5,
+  pgSchemaV6,
+  pgSchema
+]);
 var dryPg = pgSchema.parse({
   version: snapshotVersion,
   dialect: "postgresql",
@@ -5310,6 +5404,17 @@ var schemaInternalV52 = objectType({
     columns: recordType(stringType(), stringType())
   })
 }).strict();
+var kitInternals3 = objectType({
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
+}).optional();
 var latestVersion = literalType("6");
 var schemaInternal2 = objectType({
   version: latestVersion,
@@ -5319,7 +5424,8 @@ var schemaInternal2 = objectType({
   _meta: objectType({
     tables: recordType(stringType(), stringType()),
     columns: recordType(stringType(), stringType())
-  })
+  }),
+  internal: kitInternals3
 }).strict();
 var schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
 var schemaV42 = schemaInternalV42.merge(schemaHash3).strict();
@@ -5356,6 +5462,7 @@ var backwardCompatibleSqliteSchema = unionType([sqliteSchemaV5, schema2]);
 
 // src/utils.ts
 var import_path = require("path");
+var import_url = require("url");
 var copy = (it) => {
   return JSON.parse(JSON.stringify(it));
 };
@@ -5399,7 +5506,7 @@ var prepareOutFolder = (out, dialect3) => {
 var validatorForDialect = (dialect3) => {
   switch (dialect3) {
     case "postgresql":
-      return { validator: backwardCompatiblePgSchema, version: 6 };
+      return { validator: backwardCompatiblePgSchema, version: 7 };
     case "sqlite":
       return { validator: backwardCompatibleSqliteSchema, version: 6 };
     case "mysql":
@@ -5524,6 +5631,29 @@ var kloudMeta = () => {
     sqlite: []
   };
 };
+var normaliseSQLiteUrl = (it, type) => {
+  if (type === "libsql") {
+    if (it.startsWith("file:")) {
+      return it;
+    }
+    try {
+      const url = (0, import_url.parse)(it);
+      if (url.protocol === null) {
+        return `file:${it}`;
+      }
+      return it;
+    } catch (e) {
+      return `file:${it}`;
+    }
+  }
+  if (type === "better-sqlite") {
+    if (it.startsWith("file:")) {
+      return it.substring(5);
+    }
+    return it;
+  }
+  assertUnreachable(type);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   assertV1OutFolder,
@@ -5531,6 +5661,7 @@ var kloudMeta = () => {
   copy,
   dryJournal,
   kloudMeta,
+  normaliseSQLiteUrl,
   objectValues,
   prepareMigrationFolder,
   prepareMigrationMeta,

package/utils.mjs

@@ -1068,7 +1068,10 @@ var info = (msg, greyMsg = "") => {
 
 // src/global.ts
 var originUUID = "00000000-0000-0000-0000-000000000000";
-var snapshotVersion = "6";
+var snapshotVersion = "7";
+function assertUnreachable(x) {
+  throw new Error("Didn't expect to get here");
+}
 
 // node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
 var util;
@@ -4901,7 +4904,16 @@ var kitInternals = objectType({
         objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
       )
     }).optional()
-  )
+  ).optional(),
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
 }).optional();
 var dialect = literalType("mysql");
 var schemaHash = objectType({
@@ -5051,10 +5063,48 @@ var pgSchemaV1 = objectType({
   tables: recordType(stringType(), tableV1),
   enums: recordType(stringType(), enumSchemaV1)
 }).strict();
+var indexColumn = objectType({
+  expression: stringType(),
+  isExpression: booleanType(),
+  asc: booleanType(),
+  nulls: stringType().optional(),
+  opclass: stringType().optional()
+});
 var index2 = objectType({
+  name: stringType(),
+  columns: indexColumn.array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), anyType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV4 = objectType({
   name: stringType(),
   columns: stringType().array(),
-  isUnique: booleanType()
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV5 = objectType({
+  name: stringType(),
+  columns: stringType().array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
+}).strict();
+var indexV6 = objectType({
+  name: stringType(),
+  columns: stringType().array(),
+  isUnique: booleanType(),
+  with: recordType(stringType(), stringType()).optional(),
+  method: stringType().default("btree"),
+  where: stringType().optional(),
+  concurrently: booleanType().default(false)
 }).strict();
 var fk2 = objectType({
   name: stringType(),
@@ -5096,9 +5146,27 @@ var tableV42 = objectType({
   name: stringType(),
   schema: stringType(),
   columns: recordType(stringType(), column2),
-  indexes: recordType(stringType(), index2),
+  indexes: recordType(stringType(), indexV4),
   foreignKeys: recordType(stringType(), fk2)
 }).strict();
+var tableV6 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), indexV6),
+  foreignKeys: recordType(stringType(), fk2),
+  compositePrimaryKeys: recordType(stringType(), compositePK2),
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+}).strict();
+var tableV5 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), indexV5),
+  foreignKeys: recordType(stringType(), fk2),
+  compositePrimaryKeys: recordType(stringType(), compositePK2),
+  uniqueConstraints: recordType(stringType(), uniqueConstraint2).default({})
+}).strict();
 var table2 = objectType({
   name: stringType(),
   schema: stringType(),
@@ -5143,7 +5211,7 @@ var pgSchemaInternalV4 = objectType({
 var pgSchemaInternalV5 = objectType({
   version: literalType("5"),
   dialect: literalType("pg"),
-  tables: recordType(stringType(), table2),
+  tables: recordType(stringType(), tableV5),
   enums: recordType(stringType(), enumSchemaV1),
   schemas: recordType(stringType(), stringType()),
   _meta: objectType({
@@ -5153,6 +5221,19 @@ var pgSchemaInternalV5 = objectType({
   }),
   internal: kitInternals2
 }).strict();
+var pgSchemaInternalV6 = objectType({
+  version: literalType("6"),
+  dialect: literalType("postgresql"),
+  tables: recordType(stringType(), tableV6),
+  enums: recordType(stringType(), enumSchema),
+  schemas: recordType(stringType(), stringType()),
+  _meta: objectType({
+    schemas: recordType(stringType(), stringType()),
+    tables: recordType(stringType(), stringType()),
+    columns: recordType(stringType(), stringType())
+  }),
+  internal: kitInternals2
+}).strict();
 var pgSchemaExternal = objectType({
   version: literalType("5"),
   dialect: literalType("pg"),
@@ -5166,7 +5247,7 @@ var pgSchemaExternal = objectType({
   })
 }).strict();
 var pgSchemaInternal = objectType({
-  version: literalType("6"),
+  version: literalType("7"),
   dialect: literalType("postgresql"),
   tables: recordType(stringType(), table2),
   enums: recordType(stringType(), enumSchema),
@@ -5201,18 +5282,30 @@ var pgSchemaSquashedV4 = objectType({
   enums: recordType(stringType(), enumSchemaV1),
   schemas: recordType(stringType(), stringType())
 }).strict();
-var pgSchemaSquashed = objectType({
+var pgSchemaSquashedV6 = objectType({
   version: literalType("6"),
   dialect: literalType("postgresql"),
   tables: recordType(stringType(), tableSquashed2),
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType())
 }).strict();
+var pgSchemaSquashed = objectType({
+  version: literalType("7"),
+  dialect: literalType("postgresql"),
+  tables: recordType(stringType(), tableSquashed2),
+  enums: recordType(stringType(), enumSchema),
+  schemas: recordType(stringType(), stringType())
+}).strict();
 var pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
 var pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
 var pgSchemaV5 = pgSchemaInternalV5.merge(schemaHash2);
+var pgSchemaV6 = pgSchemaInternalV6.merge(schemaHash2);
 var pgSchema = pgSchemaInternal.merge(schemaHash2);
-var backwardCompatiblePgSchema = unionType([pgSchemaV5, pgSchema]);
+var backwardCompatiblePgSchema = unionType([
+  pgSchemaV5,
+  pgSchemaV6,
+  pgSchema
+]);
 var dryPg = pgSchema.parse({
   version: snapshotVersion,
   dialect: "postgresql",
@@ -5301,6 +5394,17 @@ var schemaInternalV52 = objectType({
     columns: recordType(stringType(), stringType())
   })
 }).strict();
+var kitInternals3 = objectType({
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
+}).optional();
 var latestVersion = literalType("6");
 var schemaInternal2 = objectType({
   version: latestVersion,
@@ -5310,7 +5414,8 @@ var schemaInternal2 = objectType({
   _meta: objectType({
     tables: recordType(stringType(), stringType()),
     columns: recordType(stringType(), stringType())
-  })
+  }),
+  internal: kitInternals3
 }).strict();
 var schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
 var schemaV42 = schemaInternalV42.merge(schemaHash3).strict();
@@ -5347,6 +5452,7 @@ var backwardCompatibleSqliteSchema = unionType([sqliteSchemaV5, schema2]);
 
 // src/utils.ts
 import { join } from "path";
+import { parse } from "url";
 var copy = (it) => {
   return JSON.parse(JSON.stringify(it));
 };
@@ -5390,7 +5496,7 @@ var prepareOutFolder = (out, dialect3) => {
 var validatorForDialect = (dialect3) => {
   switch (dialect3) {
     case "postgresql":
-      return { validator: backwardCompatiblePgSchema, version: 6 };
+      return { validator: backwardCompatiblePgSchema, version: 7 };
     case "sqlite":
       return { validator: backwardCompatibleSqliteSchema, version: 6 };
     case "mysql":
@@ -5515,12 +5621,36 @@ var kloudMeta = () => {
     sqlite: []
   };
 };
+var normaliseSQLiteUrl = (it, type) => {
+  if (type === "libsql") {
+    if (it.startsWith("file:")) {
+      return it;
+    }
+    try {
+      const url = parse(it);
+      if (url.protocol === null) {
+        return `file:${it}`;
+      }
+      return it;
+    } catch (e) {
+      return `file:${it}`;
+    }
+  }
+  if (type === "better-sqlite") {
+    if (it.startsWith("file:")) {
+      return it.substring(5);
+    }
+    return it;
+  }
+  assertUnreachable(type);
+};
 export {
   assertV1OutFolder,
   columnRenameKey,
   copy,
   dryJournal,
   kloudMeta,
+  normaliseSQLiteUrl,
   objectValues,
   prepareMigrationFolder,
   prepareMigrationMeta,