@mikro-orm/sql 7.0.0-dev.302 → 7.0.0-dev.304

package/AbstractSqlDriver.js

@@ -894,7 +894,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
         const pks = Utils.flatten(pkProps.map(pk => meta.properties[pk].fieldNames));
         sql +=
             pks.length > 1
-                ? `(${pks.map(pk => `${this.platform.quoteIdentifier(pk)}`).join(', ')})`
+                ? `(${pks.map(pk => this.platform.quoteIdentifier(pk)).join(', ')})`
                 : this.platform.quoteIdentifier(pks[0]);
         const conds = where.map(cond => {
             if (Utils.isPlainObject(cond) && Utils.getObjectKeysSize(cond) === 1) {

package/AbstractSqlPlatform.js

@@ -64,7 +64,7 @@ export class AbstractSqlPlatform extends Platform {
     }
     getSearchJsonPropertyKey(path, type, aliased, value) {
         const [a, ...b] = path;
-        const quoteKey = (key) => (key.match(/^[a-z]\w*$/i) ? key : `"${key}"`);
+        const quoteKey = (key) => (/^[a-z]\w*$/i.exec(key) ? key : `"${key}"`);
         if (aliased) {
             return raw(alias => `json_extract(${this.quoteIdentifier(`${alias}.${a}`)}, '$.${b.map(quoteKey).join('.')}')`);
         }

package/dialects/mysql/MySqlSchemaHelper.js

@@ -46,7 +46,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
                 const createView = await connection.execute(`show create view \`${view.view_name}\``);
                 if (createView[0]?.['Create View']) {
                     // Extract SELECT statement from CREATE VIEW ... AS SELECT ...
-                    const match = createView[0]['Create View'].match(/\bAS\s+(.+)$/is);
+                    const match = /\bAS\s+(.+)$/is.exec(createView[0]['Create View']);
                     definition = match?.[1]?.trim();
                 }
             }
@@ -339,7 +339,7 @@ export class MySqlSchemaHelper extends SchemaHelper {
             o[item.table_name][item.column_name] = item.column_type
                 .match(/enum\((.*)\)/)[1]
                 .split(',')
-                .map((item) => item.match(/'(.*)'/)[1]);
+                .map((item) => /'(.*)'/.exec(item)[1]);
             return o;
         }, {});
     }

package/dialects/postgresql/BasePostgreSqlPlatform.js

@@ -168,7 +168,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
         return ['begin'];
     }
     marshallArray(values) {
-        const quote = (v) => (v === '' || v.match(/["{},\\]/) ? JSON.stringify(v) : v);
+        const quote = (v) => (v === '' || /["{},\\]/.exec(v) ? JSON.stringify(v) : v);
         return `{${values.map(v => quote('' + v)).join(',')}}`;
     }
     /* v8 ignore next */
@@ -183,7 +183,7 @@ export class BasePostgreSqlPlatform extends AbstractSqlPlatform {
             if (v === `""`) {
                 return '';
             }
-            if (v.match(/"(.*)"/)) {
+            if (/"(.*)"/.exec(v)) {
                 return v.substring(1, v.length - 1).replaceAll('\\"', '"');
             }
             return v;

package/dialects/postgresql/PostgreSqlSchemaHelper.js

@@ -152,7 +152,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             if (index.condeferrable) {
                 indexDef.deferMode = index.condeferred ? DeferMode.INITIALLY_DEFERRED : DeferMode.INITIALLY_IMMEDIATE;
             }
-            if (index.index_def.some((col) => col.match(/[(): ,"'`]/)) || index.expression?.match(/ where /i)) {
+            if (index.index_def.some((col) => /[(): ,"'`]/.exec(col)) || index.expression?.match(/ where /i)) {
                 indexDef.expression = index.expression;
             }
             if (index.deferrable) {
@@ -190,7 +190,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         // Extract just the column list from the expression (between first parens after USING)
         // Pattern: ... USING method (...columns...) [INCLUDE (...)] [WHERE ...]
         // Note: pg_get_indexdef always returns a valid expression with USING clause
-        const usingMatch = expression.match(/using\s+\w+\s*\(/i);
+        const usingMatch = /using\s+\w+\s*\(/i.exec(expression);
         const startIdx = usingMatch.index + usingMatch[0].length - 1; // Position of opening (
         const columnsStr = this.extractParenthesizedContent(expression, startIdx);
         // Use the column names from columnDefs and find their modifiers in the expression
@@ -209,12 +209,12 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                     result.sort = 'DESC';
                 }
                 // Extract NULLS ordering
-                const nullsMatch = modifiers.match(/nulls\s+(first|last)/i);
+                const nullsMatch = /nulls\s+(first|last)/i.exec(modifiers);
                 if (nullsMatch) {
                     result.nulls = nullsMatch[1].toUpperCase();
                 }
                 // Extract collation
-                const collateMatch = modifiers.match(/collate\s+"?([^"\s,)]+)"?/i);
+                const collateMatch = /collate\s+"?([^"\s,)]+)"?/i.exec(modifiers);
                 if (collateMatch) {
                     result.collation = collateMatch[1];
                 }
@@ -333,7 +333,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
             }
             seen.add(dedupeKey);
             ret[key] ??= [];
-            const m = check.expression.match(/^check \(\((.*)\)\)$/is);
+            const m = /^check \(\((.*)\)\)$/is.exec(check.expression);
             const def = m?.[1].replace(/\((.*?)\)::\w+/g, '$1');
             ret[key].push({
                 name: check.name,
@@ -362,7 +362,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         const allFks = await connection.execute(sql);
         const ret = {};
         function mapReferentialIntegrity(value, def) {
-            const match = ['n', 'd'].includes(value) && def.match(/ON DELETE (SET (NULL|DEFAULT) \(.*?\))/);
+            const match = ['n', 'd'].includes(value) && /ON DELETE (SET (NULL|DEFAULT) \(.*?\))/.exec(def);
             if (match) {
                 return match[1];
             }
@@ -465,10 +465,10 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
                 let items;
                 /* v8 ignore next */
                 if (m3) {
-                    items = m3.map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
+                    items = m3.map((item) => /^\(?'(.*)'/.exec(item.trim())?.[1]);
                 }
                 else {
-                    items = m2[1].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
+                    items = m2[1].split(',').map((item) => /^\(?'(.*)'/.exec(item.trim())?.[1]);
                 }
                 items = items.filter(item => item !== undefined);
                 if (items.length > 0) {
@@ -605,7 +605,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
         if (!defaultValue || typeof defaultValue !== 'string') {
             return super.normalizeDefaultValue(defaultValue, length, PostgreSqlSchemaHelper.DEFAULT_VALUES);
         }
-        const match = defaultValue.match(/^'(.*)'::(.*)$/);
+        const match = /^'(.*)'::(.*)$/.exec(defaultValue);
         if (match) {
             if (match[2] === 'integer') {
                 return +match[1];
@@ -723,7 +723,7 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
       order by pgc.conname`;
     }
     inferLengthFromColumnType(type) {
-        const match = type.match(/^(\w+(?:\s+\w+)*)\s*(?:\(\s*(\d+)\s*\)|$)/);
+        const match = /^(\w+(?:\s+\w+)*)\s*(?:\(\s*(\d+)\s*\)|$)/.exec(type);
         if (!match) {
             return;
         }

package/dialects/sqlite/SqliteSchemaHelper.js

@@ -220,7 +220,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         const columns = {};
         const constraints = [];
         // extract all columns definitions
-        let columnsDef = sql.replaceAll('\n', '').match(new RegExp(`create table [\`"']?.*?[\`"']? \\((.*)\\)`, 'i'))?.[1];
+        let columnsDef = new RegExp(`create table [\`"']?.*?[\`"']? \\((.*)\\)`, 'i').exec(sql.replaceAll('\n', ''))?.[1];
         /* v8 ignore next */
         if (columnsDef) {
             if (columnsDef.includes(', constraint ')) {
@@ -230,7 +230,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
             for (let i = cols.length - 1; i >= 0; i--) {
                 const col = cols[i];
                 const re = ` *, *[\`"']?${col.name}[\`"']? (.*)`;
-                const columnDef = columnsDef.match(new RegExp(re, 'i'));
+                const columnDef = new RegExp(re, 'i').exec(columnsDef);
                 if (columnDef) {
                     columns[col.name] = { name: col.name, definition: columnDef[1] };
                     columnsDef = columnsDef.substring(0, columnDef.index);
@@ -260,7 +260,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
      * Extracts the SELECT part from a CREATE VIEW statement.
      */
     extractViewDefinition(viewDefinition) {
-        const match = viewDefinition?.match(/create\s+view\s+[`"']?\w+[`"']?\s+as\s+(.*)/i);
+        const match = /create\s+view\s+[`"']?\w+[`"']?\s+as\s+(.*)/i.exec(viewDefinition);
         /* v8 ignore next - fallback for non-standard view definitions */
         return match ? match[1] : viewDefinition;
     }
@@ -307,7 +307,11 @@ export class SqliteSchemaHelper extends SchemaHelper {
             return null;
         }
         // simple values that are returned as-is from pragma (no wrapping needed)
-        if (/^-?\d/.test(value) || /^[xX]'/.test(value) || value[0] === "'" || value[0] === '"' || value[0] === '(') {
+        if (/^-?\d/.test(value) ||
+            /^[xX]'/.test(value) ||
+            value.startsWith("'") ||
+            value.startsWith('"') ||
+            value.startsWith('(')) {
             return value;
         }
         const lower = value.toLowerCase();
@@ -325,10 +329,10 @@ export class SqliteSchemaHelper extends SchemaHelper {
         return checkConstraints.reduce((o, item) => {
             // check constraints are defined as (note that last closing paren is missing):
             // `type` text check (`type` in ('local', 'global')
-            const match = item.match(/[`["']([^`\]"']+)[`\]"'] text check \(.* \((.*)\)/i);
+            const match = /[`["']([^`\]"']+)[`\]"'] text check \(.* \((.*)\)/i.exec(item);
             /* v8 ignore next */
             if (match) {
-                o[match[1]] = match[2].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)[1]);
+                o[match[1]] = match[2].split(',').map((item) => /^\(?'(.*)'/.exec(item.trim())[1]);
             }
             return o;
         }, {});
@@ -371,7 +375,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
         const checks = [];
         for (const key of Object.keys(columns)) {
             const column = columns[key];
-            const expression = column.definition.match(/ (check \((.*)\))/i);
+            const expression = / (check \((.*)\))/i.exec(column.definition);
             if (expression) {
                 checks.push({
                     name: this.platform.getConfig().getNamingStrategy().indexName(tableName, [column.name], 'check'),
@@ -382,7 +386,7 @@ export class SqliteSchemaHelper extends SchemaHelper {
             }
         }
         for (const constraint of constraints) {
-            const expression = constraint.match(/constraint *[`"']?(.*?)[`"']? * (check \((.*)\))/i);
+            const expression = /constraint *[`"']?(.*?)[`"']? * (check \((.*)\))/i.exec(constraint);
             if (expression) {
                 checks.push({
                     name: expression[1],

package/index.d.ts

@@ -13,7 +13,7 @@ export * from './query/index.js';
 export { raw } from './query/index.js';
 export * from './schema/index.js';
 export * from './dialects/index.js';
-export * from './typings.js';
+export type * from './typings.js';
 export * from './plugin/index.js';
 export { SqlEntityManager as EntityManager } from './SqlEntityManager.js';
 export { SqlEntityRepository as EntityRepository } from './SqlEntityRepository.js';

package/index.js

@@ -13,7 +13,6 @@ export * from './query/index.js';
 export { raw } from './query/index.js';
 export * from './schema/index.js';
 export * from './dialects/index.js';
-export * from './typings.js';
 export * from './plugin/index.js';
 export { SqlEntityManager as EntityManager } from './SqlEntityManager.js';
 export { SqlEntityRepository as EntityRepository } from './SqlEntityRepository.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.0.0-dev.302",
+  "version": "7.0.0-dev.304",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^6.6.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.302"
+    "@mikro-orm/core": "7.0.0-dev.304"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/ObjectCriteriaNode.js

@@ -303,6 +303,6 @@ export class ObjectCriteriaNode extends CriteriaNode {
         return nestedAlias;
     }
     isPrefixed(field) {
-        return !!field.match(/\w+\./);
+        return !!/\w+\./.exec(field);
     }
 }

package/query/QueryBuilder.js

@@ -117,7 +117,7 @@ export class QueryBuilder {
                 }
                 return f;
             }
-            const asMatch = f.match(FIELD_ALIAS_RE);
+            const asMatch = FIELD_ALIAS_RE.exec(f);
             if (asMatch) {
                 return `${this.resolveNestedPath(asMatch[1].trim())} as ${asMatch[2]}`;
             }
@@ -511,7 +511,7 @@ export class QueryBuilder {
         const aliases = new Set();
         for (const field of this._fields ?? []) {
             if (typeof field === 'string') {
-                const m = field.match(FIELD_ALIAS_RE);
+                const m = FIELD_ALIAS_RE.exec(field);
                 if (m) {
                     aliases.add(m[2]);
                 }
@@ -1366,7 +1366,7 @@ export class QueryBuilder {
             // Strip 'as alias' suffix if present — the alias is passed to mapper at the end
             let field = originalField;
             let customAlias;
-            const asMatch = originalField.match(FIELD_ALIAS_RE);
+            const asMatch = FIELD_ALIAS_RE.exec(originalField);
             if (asMatch) {
                 field = asMatch[1].trim();
                 customAlias = asMatch[2];

package/query/QueryBuilderHelper.js

@@ -346,7 +346,7 @@ export class QueryBuilderHelper {
             return false;
         }
         // when including the opening bracket/paren we consider it complex
-        return !re.source.match(/[{[(]/);
+        return !/[{[(]/.exec(re.source);
     }
     getRegExpParam(re) {
         const value = re.source
@@ -806,7 +806,7 @@ export class QueryBuilderHelper {
         return { sql: `(${parts.join(' or ')})`, params };
     }
     isPrefixed(field) {
-        return !!field.match(/[\w`"[\]]+\./);
+        return !!/[\w`"[\]]+\./.exec(field);
     }
     fieldName(field, alias, always, idx = 0) {
         const prop = this.getProperty(field, alias);

package/schema/DatabaseTable.js

@@ -62,7 +62,7 @@ export class DatabaseTable {
             const type = prop.enum ? 'enum' : prop.columnTypes[idx];
             const mappedType = this.platform.getMappedType(type);
             if (mappedType instanceof DecimalType) {
-                const match = prop.columnTypes[idx].match(/\w+\((\d+), ?(\d+)\)/);
+                const match = /\w+\((\d+), ?(\d+)\)/.exec(prop.columnTypes[idx]);
                 /* v8 ignore next */
                 if (match) {
                     prop.precision ??= +match[1];
@@ -755,7 +755,7 @@ export class DatabaseTable {
             return +defaultValue;
         }
         // unquote string defaults if `raw = false`
-        const match = ('' + val).match(/^'(.*)'$/);
+        const match = /^'(.*)'$/.exec('' + val);
         if (!raw && match) {
             return match[1];
         }

package/schema/SchemaComparator.js

@@ -704,8 +704,8 @@ export class SchemaComparator {
         return from.default == to.default; // == intentionally
     }
     mapColumnToProperty(column) {
-        const length = column.type.match(/\w+\((\d+)\)/);
-        const match = column.type.match(/\w+\((\d+), ?(\d+)\)/);
+        const length = /\w+\((\d+)\)/.exec(column.type);
+        const match = /\w+\((\d+), ?(\d+)\)/.exec(column.type);
         return {
             fieldNames: [column.name],
             columnTypes: [column.type],

package/schema/SchemaHelper.js

@@ -36,7 +36,7 @@ export class SchemaHelper {
         return Utils.flatten(pks);
     }
     inferLengthFromColumnType(type) {
-        const match = type.match(/^\w+\s*(?:\(\s*(\d+)\s*\)|$)/);
+        const match = /^\w+\s*(?:\(\s*(\d+)\s*\)|$)/.exec(type);
         if (!match) {
             return;
         }