drizzle-kit 0.18.1-a48fd5c → 0.18.1-b5dc75c

package/loader.mjs

@@ -1,13 +1,47 @@
-const extensionsRegex = /\.(ts|tsx|mts|cts)$/
+import esbuild from "esbuild";
+import * as path from "path";
+import { readFileSync } from "fs";
+
+export function resolve(specifier, context, nextResolve) {
+  if (specifier.startsWith("drizzle://")) {
+    if (!specifier.endsWith(".ts")) {
+      const url = specifier.slice("drizzle://".length).toString();
+      return nextResolve(url);
+    }
 
-export async function load(url, context, defaultLoad) {
-  if (extensionsRegex.test(url)) {
-    const { source } = await defaultLoad(url, { ...context, format: 'module' })
     return {
-      ...context,
-      source: source,
+      shortCircuit: true,
+      url: specifier,
+    };
+  }
+
+  const { parentURL: url } = context;
+  const parentURL = url?.startsWith("drizzle://")
+    ? new URL(`file://${path.resolve(url.slice("drizzle://".length))}`)
+    : url;
+
+  // Let Node.js handle all other specifiers.
+  return nextResolve(specifier, { ...context, parentURL });
+}
+
+export async function load(url, context, defaultLoad) {
+  if (url.startsWith("drizzle://")) {
+
+    const path = url.slice("drizzle://".length).trim();
+    const file = readFileSync(path, "utf-8");
+    if (path.endsWith(".ts") || path.endsWith(".mts")) {
+      const source = esbuild.transformSync(file, {
+        loader: "ts",
+        format: "esm",
+      });
+      return {
+        format: "module",
+        shortCircuit: true,
+        source: source.code,
+      };
     }
   }
+
   // let Node.js handle all other URLs
-  return defaultLoad(url, context, defaultLoad)
-}
+  return defaultLoad(url, context, defaultLoad);
+}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "drizzle-kit",
-  "version": "0.18.1-a48fd5c",
+  "version": "0.18.1-b5dc75c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
   "bin": {
-    "drizzle-kit": "./index.mjs"
+    "drizzle-kit": "./index.cjs"
   },
   "scripts": {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
@@ -47,10 +47,10 @@
     ]
   },
   "dependencies": {
+    "@esbuild-kit/esm-loader": "^2.5.5",
     "camelcase": "^7.0.1",
     "chalk": "^5.2.0",
     "commander": "^9.4.1",
-    "esbuild-register": "^3.4.2",
     "glob": "^8.1.0",
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
@@ -68,8 +68,7 @@
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-kit": "^0.16.8",
-    "drizzle-orm": "0.25.1",
+    "drizzle-orm": "0.26.5-ad5d574",
     "esbuild": "^0.17.19",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",

package/utils.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --loader @esbuild-kit/esm-loader --no-warnings 
+#!/usr/bin/env -S node --loader @esbuild-kit/esm-loader --no-warnings
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -337,9 +337,9 @@ function createSupportsColor(stream, options = {}) {
 var import_node_process, import_node_os, import_node_tty, env, flagForceColor, supportsColor, supports_color_default;
 var init_supports_color = __esm({
   "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/supports-color/index.js"() {
-    import_node_process = __toESM(require("process"), 1);
-    import_node_os = __toESM(require("os"), 1);
-    import_node_tty = __toESM(require("tty"), 1);
+    import_node_process = __toESM(require("node:process"), 1);
+    import_node_os = __toESM(require("node:os"), 1);
+    import_node_tty = __toESM(require("node:tty"), 1);
     ({ env } = import_node_process.default);
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
       flagForceColor = 0;
@@ -12825,9 +12825,8 @@ var schemaSquashedV4 = objectType({
 }).strict();
 var MySqlSquasher = {
   squashIdx: (idx) => {
-    var _a, _b, _c;
     index.parse(idx);
-    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${(_a = idx.using) != null ? _a : ""};${(_b = idx.algorithm) != null ? _b : ""};${(_c = idx.lock) != null ? _c : ""}`;
+    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${idx.using ?? ""};${idx.algorithm ?? ""};${idx.lock ?? ""}`;
   },
   unsquashIdx: (input) => {
     const [name, columnsString, isUnique, using, algorithm, lock] = input.split(";");
@@ -12849,8 +12848,7 @@ var MySqlSquasher = {
     return { name: splitted[0], columns: splitted[1].split(",") };
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   unsquashFK: (input) => {
     const [
@@ -13077,8 +13075,7 @@ var PgSquasher = {
     return result;
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   squashPK: (pk) => {
     return `${pk.columns.join(",")}`;
@@ -13242,9 +13239,8 @@ var schemaSquashed2 = objectType({
 }).strict();
 var SQLiteSquasher = {
   squashIdx: (idx) => {
-    var _a;
     index3.parse(idx);
-    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${(_a = idx.where) != null ? _a : ""}`;
+    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${idx.where ?? ""}`;
   },
   unsquashIdx: (input) => {
     const [name, columnsString, isUnique, where] = input.split(";");
@@ -13252,13 +13248,12 @@ var SQLiteSquasher = {
       name,
       columns: columnsString.split(","),
       isUnique: isUnique === "true",
-      where: where != null ? where : void 0
+      where: where ?? void 0
     });
     return result;
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   unsquashFK: (input) => {
     const [
@@ -13333,7 +13328,6 @@ function diffForRenamedColumn(t1, t2) {
   return alternationsInColumn(diffed);
 }
 function applyJsonDiff(json1, json2) {
-  var _a, _b, _c;
   json1 = JSON.parse(JSON.stringify(json1));
   json2 = JSON.parse(JSON.stringify(json2));
   const rawDiff = (0, import_json_diff.diff)(json1, json2);
@@ -13344,9 +13338,9 @@ function applyJsonDiff(json1, json2) {
   }, {});
   if (!difference)
     return {};
-  difference.tables = (_a = difference.tables) != null ? _a : {};
-  difference.enums = (_b = difference.enums) != null ? _b : {};
-  difference.schemas = (_c = difference.schemas) != null ? _c : {};
+  difference.tables = difference.tables ?? {};
+  difference.enums = difference.enums ?? {};
+  difference.schemas = difference.schemas ?? {};
   const tableEntries = Object.entries(difference.tables);
   const addedTables = tableEntries.filter((it) => it[0].includes("__added")).map((it) => it[1]);
   const deletedTables = tableEntries.filter((it) => it[0].includes("__deleted")).map((it) => it[1]);
@@ -13384,8 +13378,7 @@ function applyJsonDiff(json1, json2) {
   };
 }
 var findAlternationsInTable = (table4, tableSchema) => {
-  var _a;
-  const columns = (_a = table4.columns) != null ? _a : {};
+  const columns = table4.columns ?? {};
   let schema4 = {
     type: "none",
     value: tableSchema
@@ -15414,7 +15407,7 @@ var diffResultScheme = objectType({
   deletedSchemas: stringType().array()
 }).strict();
 var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const diffResult = applyJsonDiff(json1, json2);
   if (Object.keys(diffResult).length === 0) {
     return { statements: [], sqlStatements: [], _meta: void 0 };
@@ -15674,12 +15667,12 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
     (t) => t.type === "delete_reference"
   );
-  const createEnums = (_b = (_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
+  const createEnums = ((_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
     return prepareCreateEnumJson(it.name, it.values);
-  })) != null ? _b : [];
-  const jsonAlterEnumsWithAddedValues = (_d = (_c = typedResult.alteredEnums) == null ? void 0 : _c.map((it) => {
+  })) ?? [];
+  const jsonAlterEnumsWithAddedValues = ((_b = typedResult.alteredEnums) == null ? void 0 : _b.map((it) => {
     return prepareAddValuesToEnumJson(it.name, it.addedValues);
-  }).flat()) != null ? _d : [];
+  }).flat()) ?? [];
   if (dialect3 === "mysql") {
     createdSchemas.push(...renamedSchemas.map((it) => it.to));
     deletedSchemas.push(...renamedSchemas.map((it) => it.from));
@@ -15923,7 +15916,6 @@ var validateWithReport = (snapshots, dialect3) => {
   const { validator, version } = validatorForDialect(dialect3);
   const result = snapshots.reduce(
     (accum, it) => {
-      var _a;
       const raw = JSON.parse((0, import_fs.readFileSync)(`./${it}`).toString());
       accum.rawMap[it] = raw;
       if (raw["version"] && Number(raw["version"]) > version) {
@@ -15944,7 +15936,7 @@ var validateWithReport = (snapshots, dialect3) => {
         accum.nonLatest.push(it);
         return accum;
       }
-      const idEntry = (_a = accum.idsMap[snapshot["prevId"]]) != null ? _a : {
+      const idEntry = accum.idsMap[snapshot["prevId"]] ?? {
         parent: it,
         snapshots: []
       };
@@ -16039,7 +16031,7 @@ var kloudMeta = () => {
   };
 };
 var statementsForDiffs = async (in1, in2) => {
-  const left = pgSchema.parse(in1 != null ? in1 : dryPg);
+  const left = pgSchema.parse(in1 ?? dryPg);
   const right = pgSchema.parse(in2);
   const lsquashed = squashPgScheme(left);
   const rsquashed = squashPgScheme(right);