@anthonyalayo/drizzle-kit 1.1.0 → 1.2.1

package/api.d.mts

@@ -375,7 +375,9 @@ type Config = {
         prefix?: Prefix;
     };
     introspect?: {
-        casing: 'camel' | 'preserve';
+        casing?: 'camel' | 'preserve';
+        /** postgres pull: set to `false` to name schema-scoped entities `userRole` instead of `userRoleInApp` */
+        schemaSuffix?: boolean;
     };
     entities?: {
         roles?: boolean | {

package/api.d.ts

@@ -375,7 +375,9 @@ type Config = {
         prefix?: Prefix;
     };
     introspect?: {
-        casing: 'camel' | 'preserve';
+        casing?: 'camel' | 'preserve';
+        /** postgres pull: set to `false` to name schema-scoped entities `userRole` instead of `userRoleInApp` */
+        schemaSuffix?: boolean;
     };
     entities?: {
         roles?: boolean | {

package/api.js

@@ -24379,6 +24379,127 @@ var init_selector_ui = __esm({
   }
 });
 
+// ../node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
+function camelCase(input, options) {
+  if (!(typeof input === "string" || Array.isArray(input))) {
+    throw new TypeError("Expected the input to be `string | string[]`");
+  }
+  options = {
+    pascalCase: false,
+    preserveConsecutiveUppercase: false,
+    ...options
+  };
+  if (Array.isArray(input)) {
+    input = input.map((x5) => x5.trim()).filter((x5) => x5.length).join("-");
+  } else {
+    input = input.trim();
+  }
+  if (input.length === 0) {
+    return "";
+  }
+  const toLowerCase = options.locale === false ? (string) => string.toLowerCase() : (string) => string.toLocaleLowerCase(options.locale);
+  const toUpperCase = options.locale === false ? (string) => string.toUpperCase() : (string) => string.toLocaleUpperCase(options.locale);
+  if (input.length === 1) {
+    if (SEPARATORS.test(input)) {
+      return "";
+    }
+    return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
+  }
+  const hasUpperCase = input !== toLowerCase(input);
+  if (hasUpperCase) {
+    input = preserveCamelCase(input, toLowerCase, toUpperCase, options.preserveConsecutiveUppercase);
+  }
+  input = input.replace(LEADING_SEPARATORS, "");
+  input = options.preserveConsecutiveUppercase ? preserveConsecutiveUppercase(input, toLowerCase) : toLowerCase(input);
+  if (options.pascalCase) {
+    input = toUpperCase(input.charAt(0)) + input.slice(1);
+  }
+  return postProcess(input, toUpperCase);
+}
+var UPPERCASE, LOWERCASE, LEADING_CAPITAL, IDENTIFIER, SEPARATORS, LEADING_SEPARATORS, SEPARATORS_AND_IDENTIFIER, NUMBERS_AND_IDENTIFIER, preserveCamelCase, preserveConsecutiveUppercase, postProcess;
+var init_camelcase = __esm({
+  "../node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js"() {
+    "use strict";
+    UPPERCASE = /[\p{Lu}]/u;
+    LOWERCASE = /[\p{Ll}]/u;
+    LEADING_CAPITAL = /^[\p{Lu}](?![\p{Lu}])/gu;
+    IDENTIFIER = /([\p{Alpha}\p{N}_]|$)/u;
+    SEPARATORS = /[_.\- ]+/;
+    LEADING_SEPARATORS = new RegExp("^" + SEPARATORS.source);
+    SEPARATORS_AND_IDENTIFIER = new RegExp(SEPARATORS.source + IDENTIFIER.source, "gu");
+    NUMBERS_AND_IDENTIFIER = new RegExp("\\d+" + IDENTIFIER.source, "gu");
+    preserveCamelCase = (string, toLowerCase, toUpperCase, preserveConsecutiveUppercase2) => {
+      let isLastCharLower = false;
+      let isLastCharUpper = false;
+      let isLastLastCharUpper = false;
+      let isLastLastCharPreserved = false;
+      for (let index6 = 0; index6 < string.length; index6++) {
+        const character = string[index6];
+        isLastLastCharPreserved = index6 > 2 ? string[index6 - 3] === "-" : true;
+        if (isLastCharLower && UPPERCASE.test(character)) {
+          string = string.slice(0, index6) + "-" + string.slice(index6);
+          isLastCharLower = false;
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = true;
+          index6++;
+        } else if (isLastCharUpper && isLastLastCharUpper && LOWERCASE.test(character) && (!isLastLastCharPreserved || preserveConsecutiveUppercase2)) {
+          string = string.slice(0, index6 - 1) + "-" + string.slice(index6 - 1);
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = false;
+          isLastCharLower = true;
+        } else {
+          isLastCharLower = toLowerCase(character) === character && toUpperCase(character) !== character;
+          isLastLastCharUpper = isLastCharUpper;
+          isLastCharUpper = toUpperCase(character) === character && toLowerCase(character) !== character;
+        }
+      }
+      return string;
+    };
+    preserveConsecutiveUppercase = (input, toLowerCase) => {
+      LEADING_CAPITAL.lastIndex = 0;
+      return input.replace(LEADING_CAPITAL, (m1) => toLowerCase(m1));
+    };
+    postProcess = (input, toUpperCase) => {
+      SEPARATORS_AND_IDENTIFIER.lastIndex = 0;
+      NUMBERS_AND_IDENTIFIER.lastIndex = 0;
+      return input.replace(SEPARATORS_AND_IDENTIFIER, (_3, identifier) => toUpperCase(identifier)).replace(NUMBERS_AND_IDENTIFIER, (m6) => toUpperCase(m6));
+    };
+  }
+});
+
+// src/@types/utils.ts
+var init_utils3 = __esm({
+  "src/@types/utils.ts"() {
+    "use strict";
+    init_camelcase();
+    String.prototype.trimChar = function(char) {
+      let start = 0;
+      let end = this.length;
+      while (start < end && this[start] === char) ++start;
+      while (end > start && this[end - 1] === char) --end;
+      return start > 0 || end < this.length ? this.substring(start, end) : this.toString();
+    };
+    String.prototype.squashSpaces = function() {
+      return this.replace(/  +/g, " ").trim();
+    };
+    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);
+    };
+    String.prototype.snake_case = function() {
+      return this && this.length > 0 ? `${this.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`)}` : String(this);
+    };
+    Array.prototype.random = function() {
+      return this[~~(Math.random() * this.length)];
+    };
+  }
+});
+
 // src/serializer/sqliteSerializer.ts
 function mapSqlToSqliteType(sqlType) {
   const lowered = sqlType.toLowerCase();
@@ -25876,6 +25997,7 @@ var init_cli = __esm({
       schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       extensionsFilters: literalType("postgis").array().optional(),
       casing,
+      schemaSuffix: booleanType().optional(),
       breakpoints: booleanType().optional().default(true),
       migrations: objectType({
         prefix: prefix.optional().default("index")
@@ -26164,7 +26286,7 @@ var init_es5 = __esm({
 
 // src/cli/commands/utils.ts
 var import_hanji7, assertES5, InMemoryMutex, registerMutex, tsxRegistered, ensureTsxRegistered, safeRegister, migrateConfig;
-var init_utils3 = __esm({
+var init_utils4 = __esm({
   "src/cli/commands/utils.ts"() {
     "use strict";
     import_hanji7 = __toESM(require_hanji());
@@ -26260,7 +26382,7 @@ var init_pgImports = __esm({
     import_drizzle_orm4 = require("drizzle-orm");
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_relations = require("drizzle-orm/relations");
-    init_utils3();
+    init_utils4();
     prepareFromExports = (exports2) => {
       const tables = [];
       const domains = [];
@@ -41517,7 +41639,7 @@ var require_semver2 = __commonJS({
 
 // src/cli/utils.ts
 var import_semver, checkPackage, assertPackages;
-var init_utils4 = __esm({
+var init_utils5 = __esm({
   "src/cli/utils.ts"() {
     "use strict";
     import_semver = __toESM(require_semver2());
@@ -45721,7 +45843,7 @@ var init_evaluateRules = __esm({
 });
 
 // ../node_modules/.pnpm/@smithy+util-endpoints@3.0.6/node_modules/@smithy/util-endpoints/dist-es/utils/index.js
-var init_utils5 = __esm({
+var init_utils6 = __esm({
   "../node_modules/.pnpm/@smithy+util-endpoints@3.0.6/node_modules/@smithy/util-endpoints/dist-es/utils/index.js"() {
     "use strict";
     init_customEndpointFunctions();
@@ -45736,7 +45858,7 @@ var init_resolveEndpoint = __esm({
     "use strict";
     init_debug();
     init_types3();
-    init_utils5();
+    init_utils6();
     resolveEndpoint = (ruleSetObject, options) => {
       const { endpointParams, logger: logger2 } = options;
       const { parameters, rules } = ruleSetObject;
@@ -46350,7 +46472,7 @@ var init_getUpdatedSystemClockOffset = __esm({
 });
 
 // ../node_modules/.pnpm/@aws-sdk+core@3.816.0/node_modules/@aws-sdk/core/dist-es/submodules/httpAuthSchemes/utils/index.js
-var init_utils6 = __esm({
+var init_utils7 = __esm({
   "../node_modules/.pnpm/@aws-sdk+core@3.816.0/node_modules/@aws-sdk/core/dist-es/submodules/httpAuthSchemes/utils/index.js"() {
     "use strict";
     init_getDateHeader();
@@ -46365,7 +46487,7 @@ var init_AwsSdkSigV4Signer = __esm({
   "../node_modules/.pnpm/@aws-sdk+core@3.816.0/node_modules/@aws-sdk/core/dist-es/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4Signer.js"() {
     "use strict";
     init_dist_es2();
-    init_utils6();
+    init_utils7();
     throwSigningPropertyError = (name, property) => {
       if (!property) {
         throw new Error(`Property \`${name}\` is not resolved for AWS SDK SigV4Auth`);
@@ -72710,7 +72832,7 @@ var init_connections = __esm({
     init_wrapper();
     init_global();
     init_utils();
-    init_utils4();
+    init_utils5();
     init_outputs();
     preparePostgresDB = async (credentials2) => {
       if ("driver" in credentials2) {
@@ -73739,7 +73861,7 @@ var init_studio2 = __esm({
     import_node_https2 = require("https");
     init_global();
     init_esm();
-    init_utils3();
+    init_utils4();
     init_serializer();
     init_utils2();
     preparePgSchema = async (path3) => {
@@ -74301,7 +74423,7 @@ var init_sqliteImports = __esm({
     "use strict";
     import_drizzle_orm7 = require("drizzle-orm");
     import_sqlite_core3 = require("drizzle-orm/sqlite-core");
-    init_utils3();
+    init_utils4();
     prepareFromExports2 = (exports2) => {
       const tables = [];
       const views = [];
@@ -74345,7 +74467,7 @@ var init_mysqlImports = __esm({
     "use strict";
     import_drizzle_orm8 = require("drizzle-orm");
     import_mysql_core3 = require("drizzle-orm/mysql-core");
-    init_utils3();
+    init_utils4();
     prepareFromExports3 = (exports2) => {
       const tables = [];
       const views = [];
@@ -74692,7 +74814,7 @@ var init_singlestoreImports = __esm({
     "use strict";
     import_drizzle_orm9 = require("drizzle-orm");
     import_singlestore_core3 = require("drizzle-orm/singlestore-core");
-    init_utils3();
+    init_utils4();
     prepareFromExports4 = (exports2) => {
       const tables = [];
       const i0values = Object.values(exports2);
@@ -75434,117 +75556,7 @@ init_global();
 
 // src/introspect-sqlite.ts
 var import_casing2 = require("drizzle-orm/casing");
-
-// ../node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
-var UPPERCASE = /[\p{Lu}]/u;
-var LOWERCASE = /[\p{Ll}]/u;
-var LEADING_CAPITAL = /^[\p{Lu}](?![\p{Lu}])/gu;
-var IDENTIFIER = /([\p{Alpha}\p{N}_]|$)/u;
-var SEPARATORS = /[_.\- ]+/;
-var LEADING_SEPARATORS = new RegExp("^" + SEPARATORS.source);
-var SEPARATORS_AND_IDENTIFIER = new RegExp(SEPARATORS.source + IDENTIFIER.source, "gu");
-var NUMBERS_AND_IDENTIFIER = new RegExp("\\d+" + IDENTIFIER.source, "gu");
-var preserveCamelCase = (string, toLowerCase, toUpperCase, preserveConsecutiveUppercase2) => {
-  let isLastCharLower = false;
-  let isLastCharUpper = false;
-  let isLastLastCharUpper = false;
-  let isLastLastCharPreserved = false;
-  for (let index6 = 0; index6 < string.length; index6++) {
-    const character = string[index6];
-    isLastLastCharPreserved = index6 > 2 ? string[index6 - 3] === "-" : true;
-    if (isLastCharLower && UPPERCASE.test(character)) {
-      string = string.slice(0, index6) + "-" + string.slice(index6);
-      isLastCharLower = false;
-      isLastLastCharUpper = isLastCharUpper;
-      isLastCharUpper = true;
-      index6++;
-    } else if (isLastCharUpper && isLastLastCharUpper && LOWERCASE.test(character) && (!isLastLastCharPreserved || preserveConsecutiveUppercase2)) {
-      string = string.slice(0, index6 - 1) + "-" + string.slice(index6 - 1);
-      isLastLastCharUpper = isLastCharUpper;
-      isLastCharUpper = false;
-      isLastCharLower = true;
-    } else {
-      isLastCharLower = toLowerCase(character) === character && toUpperCase(character) !== character;
-      isLastLastCharUpper = isLastCharUpper;
-      isLastCharUpper = toUpperCase(character) === character && toLowerCase(character) !== character;
-    }
-  }
-  return string;
-};
-var preserveConsecutiveUppercase = (input, toLowerCase) => {
-  LEADING_CAPITAL.lastIndex = 0;
-  return input.replace(LEADING_CAPITAL, (m1) => toLowerCase(m1));
-};
-var postProcess = (input, toUpperCase) => {
-  SEPARATORS_AND_IDENTIFIER.lastIndex = 0;
-  NUMBERS_AND_IDENTIFIER.lastIndex = 0;
-  return input.replace(SEPARATORS_AND_IDENTIFIER, (_3, identifier) => toUpperCase(identifier)).replace(NUMBERS_AND_IDENTIFIER, (m6) => toUpperCase(m6));
-};
-function camelCase(input, options) {
-  if (!(typeof input === "string" || Array.isArray(input))) {
-    throw new TypeError("Expected the input to be `string | string[]`");
-  }
-  options = {
-    pascalCase: false,
-    preserveConsecutiveUppercase: false,
-    ...options
-  };
-  if (Array.isArray(input)) {
-    input = input.map((x5) => x5.trim()).filter((x5) => x5.length).join("-");
-  } else {
-    input = input.trim();
-  }
-  if (input.length === 0) {
-    return "";
-  }
-  const toLowerCase = options.locale === false ? (string) => string.toLowerCase() : (string) => string.toLocaleLowerCase(options.locale);
-  const toUpperCase = options.locale === false ? (string) => string.toUpperCase() : (string) => string.toLocaleUpperCase(options.locale);
-  if (input.length === 1) {
-    if (SEPARATORS.test(input)) {
-      return "";
-    }
-    return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
-  }
-  const hasUpperCase = input !== toLowerCase(input);
-  if (hasUpperCase) {
-    input = preserveCamelCase(input, toLowerCase, toUpperCase, options.preserveConsecutiveUppercase);
-  }
-  input = input.replace(LEADING_SEPARATORS, "");
-  input = options.preserveConsecutiveUppercase ? preserveConsecutiveUppercase(input, toLowerCase) : toLowerCase(input);
-  if (options.pascalCase) {
-    input = toUpperCase(input.charAt(0)) + input.slice(1);
-  }
-  return postProcess(input, toUpperCase);
-}
-
-// src/@types/utils.ts
-String.prototype.trimChar = function(char) {
-  let start = 0;
-  let end = this.length;
-  while (start < end && this[start] === char) ++start;
-  while (end > start && this[end - 1] === char) --end;
-  return start > 0 || end < this.length ? this.substring(start, end) : this.toString();
-};
-String.prototype.squashSpaces = function() {
-  return this.replace(/  +/g, " ").trim();
-};
-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);
-};
-String.prototype.snake_case = function() {
-  return this && this.length > 0 ? `${this.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`)}` : String(this);
-};
-Array.prototype.random = function() {
-  return this[~~(Math.random() * this.length)];
-};
-
-// src/introspect-sqlite.ts
+init_utils3();
 init_global();
 
 // src/cli/commands/sqliteIntrospect.ts