drizzle-kit 0.19.8 → 0.19.9-cc05443

package/index.d.ts

@@ -2,6 +2,7 @@ export type Config = {
     out?: string | undefined;
     breakpoints?: boolean | undefined;
     tablesFilter?: string | string[] | undefined;
+    schemaFilter?: string | string[] | undefined;
     schema?: string | string[];
     verbose?: boolean | undefined;
     strict?: boolean | undefined;

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 = it.startsWith("file://") ? "file://".length : 0;
+    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.8",
+  "version": "0.19.9-cc05443",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -8,10 +8,11 @@
     "drizzle-kit": "./index.cjs"
   },
   "scripts": {
+    "test:pg:push": "drizzle-kit push:pg",
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "push:sqlite": "node -r ./src/loader.mjs ./src/cli/index.ts push:sqlite",
-    "try1": "tsx ./dev/test.ts",
+    "try1": "tsx ./src/t.ts",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
     "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg",
     "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite",

package/utils.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --loader @esbuild-kit/esm-loader --no-warnings
+#!/usr/bin/env node --loader @esbuild-kit/esm-loader --no-warnings
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -13056,6 +13056,18 @@ var pgSchemaInternalV4 = objectType({
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType())
 }).strict();
+var pgSchemaExternal = objectType({
+  version: literalType("5"),
+  dialect: literalType("pg"),
+  tables: arrayType(table2),
+  enums: arrayType(enumSchema),
+  schemas: arrayType(objectType({ name: stringType() })),
+  _meta: objectType({
+    schemas: recordType(stringType(), stringType()),
+    tables: recordType(stringType(), stringType()),
+    columns: recordType(stringType(), stringType())
+  })
+}).strict();
 var pgSchemaInternal = objectType({
   version: literalType("5"),
   dialect: literalType("pg"),
@@ -15195,7 +15207,8 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
         ////
         type: "alter_table_alter_column_drop_pk",
         tableName,
-        columnName
+        columnName,
+        schema: schema4
       });
     }
     if (((_g = column4.default) == null ? void 0 : _g.type) === "added") {
@@ -16067,12 +16080,12 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
     });
     jsonStatements.push(...jsonMySqlCreateTables);
   }
+  jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
   jsonStatements.push(...jsonDropTables);
   jsonStatements.push(...jsonRenameTables);
   jsonStatements.push(...jsonRenameColumnsStatements);
   jsonStatements.push(...jsonDeletedCompositePKs);
   jsonStatements.push(...jsonDeletedUniqueConstraints);
-  jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
   jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
   jsonStatements.push(...jsonTableAlternations.alterColumns);
   jsonStatements.push(...jsonTableAlternations.createColumns);