drizzle-kit 0.18.1-c8247c5 → 0.18.1-c862e6a

package/index.cjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --loader drizzle-kit/loader.mjs -r esbuild-register --no-warnings
+#!/usr/bin/env -S node --loader drizzle-kit/loader.mjs --no-warnings
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -16702,7 +16702,7 @@ var init_mysqlImports = __esm({
       const schemas = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(it);
+        const i0 = await import(`drizzle://${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if (t instanceof import_mysql_core.MySqlTable) {
@@ -17112,7 +17112,7 @@ var init_pgImports = __esm({
       const schemas = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(it);
+        const i0 = await import(`drizzle://${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if ((0, import_pg_core.isPgEnum)(t)) {
@@ -17637,7 +17637,7 @@ var init_sqliteImports = __esm({
       const enums = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(it);
+        const i0 = await import(`drizzle://${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if (t instanceof import_sqlite_core.SQLiteTable) {
@@ -46419,16 +46419,22 @@ var assertPackages = async (...pkgs) => {
 };
 var requiredApiVersion = 4;
 var assertOrmCoreVersion = async () => {
-  const { compatibilityVersion } = await import("drizzle-orm/version");
-  if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
-    return;
-  if (!compatibilityVersion || compatibilityVersion < requiredApiVersion) {
-    console.log(
-      "This version of drizzle-kit requires newer version of drizzle-orm\nPlease update drizzle-orm package to the latest version \u{1F44D}"
-    );
-  } else {
+  try {
+    const { compatibilityVersion } = await import("drizzle-orm/version");
+    if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
+      return;
+    if (!compatibilityVersion || compatibilityVersion < requiredApiVersion) {
+      console.log(
+        "This version of drizzle-kit requires newer version of drizzle-orm\nPlease update drizzle-orm package to the latest version \u{1F44D}"
+      );
+    } else {
+      console.log(
+        "This version of drizzle-kit is outdated\nPlease update drizzle-kit package to the latest version \u{1F44D}"
+      );
+    }
+  } catch (e) {
     console.log(
-      "This version of drizzle-kit is outdated\nPlease update drizzle-kit package to the latest version \u{1F44D}"
+      "Please install latest version of drizzle-orm"
     );
   }
   process.exit(1);
@@ -46495,10 +46501,10 @@ var package_default = {
     ]
   },
   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",
@@ -46720,10 +46726,8 @@ var drizzleConfigFromFile = async (configPath) => {
     process.exit(1);
   }
   console.log(source_default.grey(`Reading config file '${path3}'`));
-  const required = await import(path3);
+  const required = await import(`drizzle://${path3}`);
   const content = required.default ?? required;
-  console.log(required);
-  console.log(required.default);
   const res = mySqlCliConfigSchema.safeParse(content);
   if (!res.success) {
     console.error(res.error);
@@ -46752,7 +46756,7 @@ var readDrizzleConfig = async (configPath) => {
     process.exit(1);
   }
   console.log(source_default.grey(`Reading config file '${path3}'`));
-  const required = await import(path3);
+  const required = await import(`drizzle://${path3}`);
   const content = required.default ?? required;
   return content;
 };

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,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.18.1-c8247c5",
+  "version": "0.18.1-c862e6a",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -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",

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;