drizzle-kit 0.20.17-14a4eaa → 0.20.17-151701

package/@types/utils.d.ts

@@ -2,6 +2,7 @@ declare global {
     interface String {
         trimChar(char: string): string;
         squashSpaces(): string;
+        capitalise(): string;
         camelCase(): string;
         concatIf(it: string, condition: boolean): string;
     }

package/bin.cjs

@@ -1076,7 +1076,7 @@ var require_hanji = __commonJS({
 });
 
 // src/cli/views.ts
-var import_hanji, err, info, error, schema, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
+var import_hanji, err, info, grey, error, schema, isRenamePromptItem, ResolveColumnSelect, tableKey, ResolveSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
 var init_views = __esm({
   "src/cli/views.ts"() {
     "use strict";
@@ -1089,6 +1089,9 @@ var init_views = __esm({
     info = (msg, greyMsg = "") => {
       return `${source_default.blue.bold("Info:")} ${msg} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
+    grey = (msg) => {
+      return source_default.grey(msg);
+    };
     error = (error2, greyMsg = "") => {
       return `${source_default.red.bold("Err:")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
@@ -1339,14 +1342,14 @@ Is ${source_default.bold.blue(
         this.requestLayout();
       }
       render() {
-        let info3 = "";
+        let info4 = "";
         const spin = this.spinner.value();
-        info3 += this.statusText(spin, this.state.tables);
-        info3 += this.statusText(spin, this.state.columns);
-        info3 += this.statusText(spin, this.state.enums);
-        info3 += this.statusText(spin, this.state.indexes);
-        info3 += this.statusText(spin, this.state.fks);
-        return info3;
+        info4 += this.statusText(spin, this.state.tables);
+        info4 += this.statusText(spin, this.state.columns);
+        info4 += this.statusText(spin, this.state.enums);
+        info4 += this.statusText(spin, this.state.indexes);
+        info4 += this.statusText(spin, this.state.fks);
+        return info4;
       }
     };
     DropMigrationView = class extends import_hanji.Prompt {
@@ -8320,6 +8323,9 @@ var init_utils3 = __esm({
     String.prototype.camelCase = function() {
       return camelCase(String(this));
     };
+    String.prototype.capitalise = function() {
+      return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+    };
     String.prototype.concatIf = function(it, condition) {
       return condition ? `${this}${it}` : String(this);
     };
@@ -11743,13 +11749,13 @@ var require_node2 = __commonJS({
       }
       function asyncGeneratorStep(gen, resolve2, reject, _next, _throw, key, arg) {
         try {
-          var info3 = gen[key](arg);
-          var value = info3.value;
+          var info4 = gen[key](arg);
+          var value = info4.value;
         } catch (error2) {
           reject(error2);
           return;
         }
-        if (info3.done) {
+        if (info4.done) {
           resolve2(value);
         } else {
           Promise.resolve(value).then(_next, _throw);
@@ -28299,7 +28305,7 @@ var require_partial = __commonJS({
       match(filepath) {
         const parts = filepath.split("/");
         const levels = parts.length;
-        const patterns = this._storage.filter((info3) => !info3.complete || info3.segments.length > levels);
+        const patterns = this._storage.filter((info4) => !info4.complete || info4.segments.length > levels);
         for (const pattern of patterns) {
           const section = pattern.sections[0];
           if (!pattern.complete && levels > section.length) {
@@ -36952,14 +36958,14 @@ var init_dist = __esm({
     if (typeof global.crypto === "undefined") {
       global.crypto = import_crypto2.default;
     }
-    global.fetch = (info3, init2) => {
+    global.fetch = (info4, init2) => {
       init2 = {
         // Disable compression handling so people can return the result of a fetch
         // directly in the loader without messing with the Content-Encoding header.
         compress: false,
         ...init2
       };
-      return webFetch(info3, init2);
+      return webFetch(info4, init2);
     };
     regBuffer = /^no$/i;
     regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
@@ -43609,13 +43615,13 @@ var require_websocket_server = __commonJS({
           }
         }
         if (this.options.verifyClient) {
-          const info3 = {
+          const info4 = {
             origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
             secure: !!(req.socket.authorized || req.socket.encrypted),
             req
           };
           if (this.options.verifyClient.length === 2) {
-            this.options.verifyClient(info3, (verified, code, message, headers) => {
+            this.options.verifyClient(info4, (verified, code, message, headers) => {
               if (!verified) {
                 return abortHandshake(socket, code || 401, message, headers);
               }
@@ -43631,7 +43637,7 @@ var require_websocket_server = __commonJS({
             });
             return;
           }
-          if (!this.options.verifyClient(info3))
+          if (!this.options.verifyClient(info4))
             return abortHandshake(socket, 401);
         }
         this.completeUpgrade(extensions, key, protocols, req, socket, head, cb);
@@ -54993,7 +54999,7 @@ var require_dist_cjs42 = __commonJS({
       calculateBodyLength: () => calculateBodyLength
     });
     module2.exports = __toCommonJS2(src_exports2);
-    var import_fs12 = require("fs");
+    var import_fs13 = require("fs");
     var calculateBodyLength = /* @__PURE__ */ __name((body) => {
       if (!body) {
         return 0;
@@ -55007,9 +55013,9 @@ var require_dist_cjs42 = __commonJS({
       } else if (typeof body.start === "number" && typeof body.end === "number") {
         return body.end + 1 - body.start;
       } else if (typeof body.path === "string" || Buffer.isBuffer(body.path)) {
-        return (0, import_fs12.lstatSync)(body.path).size;
+        return (0, import_fs13.lstatSync)(body.path).size;
       } else if (typeof body.fd === "number") {
-        return (0, import_fs12.fstatSync)(body.fd).size;
+        return (0, import_fs13.fstatSync)(body.fd).size;
       }
       throw new Error(`Body Length computation failed for ${body}`);
     }, "calculateBodyLength");
@@ -57316,8 +57322,8 @@ var require_dist_cjs47 = __commonJS({
       }
     }, "validateTokenKey");
     var import_shared_ini_file_loader = require_dist_cjs13();
-    var import_fs12 = require("fs");
-    var { writeFile } = import_fs12.promises;
+    var import_fs13 = require("fs");
+    var { writeFile } = import_fs13.promises;
     var writeSSOTokenToFile = /* @__PURE__ */ __name((id, ssoToken) => {
       const tokenFilepath = (0, import_shared_ini_file_loader.getSSOTokenFilepath)(id);
       const tokenString = JSON.stringify(ssoToken, null, 2);
@@ -83234,13 +83240,13 @@ var require_websocket_server2 = __commonJS({
           }
         }
         if (this.options.verifyClient) {
-          const info3 = {
+          const info4 = {
             origin: req.headers[`${version2 === 8 ? "sec-websocket-origin" : "origin"}`],
             secure: !!(req.socket.authorized || req.socket.encrypted),
             req
           };
           if (this.options.verifyClient.length === 2) {
-            this.options.verifyClient(info3, (verified, code, message, headers) => {
+            this.options.verifyClient(info4, (verified, code, message, headers) => {
               if (!verified) {
                 return abortHandshake(socket, code || 401, message, headers);
               }
@@ -83256,7 +83262,7 @@ var require_websocket_server2 = __commonJS({
             });
             return;
           }
-          if (!this.options.verifyClient(info3))
+          if (!this.options.verifyClient(info4))
             return abortHandshake(socket, 401);
         }
         this.completeUpgrade(extensions, key, protocols, req, socket, head, cb);
@@ -103769,7 +103775,7 @@ var init_introspect_pg = __esm({
       assertUnreachable(casing2);
     };
     paramNameFor = (name, schema5) => {
-      const schemaSuffix = schema5 && schema5 !== "public" ? `In${schema5}` : "";
+      const schemaSuffix = schema5 && schema5 !== "public" ? `In${schema5.capitalise()}` : "";
       return `${name}${schemaSuffix}`;
     };
     schemaToTypeScript3 = (schema5, casing2) => {
@@ -104663,7 +104669,6 @@ var init_introspect = __esm({
       const relationsTs = relationsToTypeScript(schema5, casing2);
       const { internal, ...schemaWithoutInternals } = schema5;
       const schemaFile = (0, import_path7.join)(out, "schema.ts");
-      (0, import_fs11.mkdirSync)(out, { recursive: true });
       (0, import_fs11.writeFileSync)(schemaFile, ts2.file);
       const relationsFile = (0, import_path7.join)(out, "relations.ts");
       (0, import_fs11.writeFileSync)(relationsFile, relationsTs.file);
@@ -104865,8 +104870,10 @@ var init_introspect = __esm({
       const tableRelations = {};
       Object.values(schema5.tables).forEach((table4) => {
         Object.values(table4.foreignKeys).forEach((fk4) => {
-          const tableFrom = withCasing3(fk4.tableFrom, casing2);
-          const tableTo = withCasing3(fk4.tableTo, casing2);
+          const tableNameFrom = paramNameFor(fk4.tableFrom, table4.schema);
+          const tableNameTo = paramNameFor(fk4.tableTo, fk4.schemaTo);
+          const tableFrom = withCasing3(tableNameFrom, casing2);
+          const tableTo = withCasing3(tableNameTo, casing2);
           const columnFrom = withCasing3(fk4.columnsFrom[0], casing2);
           const columnTo = withCasing3(fk4.columnsTo[0], casing2);
           imports.push(tableTo, tableFrom);
@@ -104908,17 +104915,17 @@ import { ${uniqueImports.join(
           const hasOne = relations4.some((it) => it.type === "one");
           const hasMany = relations4.some((it) => it.type === "many");
           const preparedRelations = relations4.map(
-            (relation, index4, originArray) => {
+            (relation, relationIndex, originArray) => {
               let name = relation.name;
               let relationName;
-              const hasMultipleRelations = hasOne && hasMany && originArray.some(
-                (it) => it.type === (relation.type === "one" ? "many" : "one") && it.tableTo === relation.tableTo
+              const hasMultipleRelations = originArray.some(
+                (it, originIndex) => relationIndex !== originIndex && it.tableTo === relation.tableTo
               );
               if (hasMultipleRelations) {
                 relationName = relation.type === "one" ? `${relation.tableFrom}_${relation.columnFrom}_${relation.tableTo}_${relation.columnTo}` : `${relation.tableTo}_${relation.columnTo}_${relation.tableFrom}_${relation.columnFrom}`;
               }
               const hasDuplicatedRelation = originArray.some(
-                (it, originIndex) => it.name === relation.name && originIndex !== index4
+                (it, originIndex) => relationIndex !== originIndex && it.name === relation.name
               );
               if (hasDuplicatedRelation) {
                 name = `${relation.name}_${relation.type === "one" ? relation.columnFrom : relation.columnTo}`;
@@ -106276,6 +106283,7 @@ certs();
 init_cli();
 init_studio();
 init_views();
+var import_fs12 = require("fs");
 var printVersions = async () => {
   const v6 = await versions();
   console.log(`${source_default.gray(v6)}
@@ -106408,6 +106416,13 @@ var pullCommand = new import_commander.Command("introspect").option("--config <c
     tablesFilter,
     schemasFilter
   } = await preparePullConfig(options);
+  (0, import_fs12.mkdirSync)(out, { recursive: true });
+  console.log(
+    grey(
+      `Pulling from [${schemasFilter.map((it) => `'${it}'`).join(", ")}] list of schemas`
+    )
+  );
+  console.log();
   try {
     if (dialect7 === "postgresql") {
       const { introspectPostgres: introspectPostgres2 } = await Promise.resolve().then(() => (init_introspect(), introspect_exports));

package/cli/views.d.ts

@@ -4,6 +4,7 @@ import type { Named, NamedWithSchema } from "./commands/migrate";
 export declare const warning: (msg: string) => void;
 export declare const err: (msg: string) => void;
 export declare const info: (msg: string, greyMsg?: string) => string;
+export declare const grey: (msg: string) => string;
 export declare const error: (error: string, greyMsg?: string) => string;
 export declare const schema: (schema: CommonSchema) => string;
 export interface RenamePropmtItem<T> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.17-14a4eaa",
+  "version": "0.20.17-151701",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -19064,6 +19064,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/payload.mjs

@@ -19073,6 +19073,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/utils-studio.js

@@ -5933,6 +5933,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/utils-studio.mjs

@@ -5969,6 +5969,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };