drizzle-kit 0.19.2-69e5db4 → 0.19.2-9340465

package/index.cjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --loader drizzle-kit/loader.mjs --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;
@@ -5532,7 +5532,7 @@ var init_mysqlImports = __esm({
       const schemas = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(`__drizzle__${it}`);
+        const i0 = await import(`${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if ((0, import_drizzle_orm.is)(t, import_mysql_core.MySqlTable)) {
@@ -5943,7 +5943,7 @@ var init_pgImports = __esm({
       const schemas = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(`__drizzle__${it}`);
+        const i0 = await import(`${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if ((0, import_pg_core.isPgEnum)(t)) {
@@ -6473,7 +6473,7 @@ var init_sqliteImports = __esm({
       const enums = [];
       for (let i = 0; i < imports.length; i++) {
         const it = imports[i];
-        const i0 = await import(`__drizzle__${it}`);
+        const i0 = await import(`${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
           if ((0, import_drizzle_orm7.is)(t, import_sqlite_core.SQLiteTable)) {
@@ -44849,6 +44849,7 @@ var package_default = {
     "better-sqlite3": "^8.4.0",
     dockerode: "^3.3.4",
     dotenv: "^16.0.3",
+    "drizzle-kit": "0.19.2-e313bce",
     "drizzle-orm": "0.27.0-56b9edc",
     esbuild: "^0.17.19",
     "esbuild-register": "^3.4.2",
@@ -45083,7 +45084,7 @@ var drizzleConfigFromFile = async (configPath) => {
     process.exit(1);
   }
   console.log(source_default.grey(`Reading config file '${path3}'`));
-  const required = await import(`__drizzle__${path3}`);
+  const required = await import(`${path3}`);
   const content = required.default ?? required;
   const res = mySqlCliConfigSchema.safeParse(content);
   if (!res.success) {
@@ -45113,7 +45114,7 @@ var readDrizzleConfig = async (configPath) => {
     process.exit(1);
   }
   console.log(source_default.grey(`Reading config file '${path3}'`));
-  const required = await import(`__drizzle__${path3}`);
+  const required = await import(`${path3}`);
   const content = required.default ?? required;
   return content;
 };

package/loader.mjs

@@ -2,34 +2,44 @@ import esbuild from "esbuild";
 import * as path from "path";
 import { readFileSync } from "fs";
 
+const parse = (it) => {
+  if (!it) return { drizzle: false };
+  
+  if (it.endsWith("__drizzle__")) {
+    const offset = "file://".length;
+    const clean = it.slice(offset, -"__drizzle__".length);
+    return { drizzle: true, clean, original: it };
+  }
+  return { drizzle: false, clean: it };
+};
+
 export function resolve(specifier, context, nextResolve) {
-  if (specifier.startsWith("__drizzle__")) {
-    if (!specifier.endsWith(".ts")) {
-      const url = specifier.slice("__drizzle__".length).toString();
-      return nextResolve(url);
-    }
+  const { drizzle, clean } = parse(specifier);
+  if (drizzle && !clean.endsWith(".ts") && !clean.endsWith(".mts")) {
+    return nextResolve(clean);
+  }
 
+  if (drizzle) {
     return {
       shortCircuit: true,
-      url: specifier,
+      url: `file://${specifier}`,
     };
   }
 
-  const { parentURL: url } = context;
-  const parentURL = url?.startsWith("__drizzle__")
-    ? new URL(`file://${path.resolve(url.slice("__drizzle__".length))}`)
-    : url;
+  const parsedParent = parse(context.parentURL);
+  const parentURL = parsedParent.drizzle
+    ? new URL(`file://${path.resolve(parsedParent.clean)}`)
+    : context.parentURL;
 
   // 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 { drizzle, clean } = parse(url);
+  if (drizzle) {
+    const file = readFileSync(clean, "utf-8");
+    if (clean.endsWith(".ts") || clean.endsWith(".mts")) {
       const source = esbuild.transformSync(file, {
         loader: "ts",
         format: "esm",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.2-69e5db4",
+  "version": "0.19.2-9340465",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -75,6 +75,7 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
+    "drizzle-kit": "0.19.2-e313bce",
     "drizzle-orm": "0.27.0-56b9edc",
     "esbuild": "^0.17.19",
     "esbuild-register": "^3.4.2",