@mikro-orm/core 6.6.18-dev.0 → 6.6.18-dev.2

package/hydration/ObjectHydrator.d.ts

@@ -19,6 +19,10 @@ export declare class ObjectHydrator extends Hydrator {
     getEntityHydrator<T extends object>(meta: EntityMetadata<T>, type: 'full' | 'reference', normalizeAccessors?: boolean): EntityHydrator<T>;
     private createCollectionItemMapper;
     private wrap;
+    /** Renders a key as a single-quoted JS string literal, safe to embed in generated code. */
+    private quote;
+    /** Renders a key as an object literal key, quoted unless it is a plain identifier. */
+    private objectKey;
     private safeKey;
 }
 export {};

package/hydration/ObjectHydrator.js

@@ -80,7 +80,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             ret.push(`  if (data${dataKey} === null) {`);
             if (prop.ref) {
                 ret.push(`    entity${entityKey} = new ScalarReference();`);
-                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.bind(entity, ${this.quote(prop.name)});`);
                 ret.push(`    entity${entityKey}.set(${nullVal});`);
             }
             else {
@@ -120,14 +120,14 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             if (prop.ref) {
                 ret.push(`    const value = entity${entityKey};`);
                 ret.push(`    entity${entityKey} = oldValue_${idx} ?? new ScalarReference(value);`);
-                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.bind(entity, ${this.quote(prop.name)});`);
                 ret.push(`    entity${entityKey}.set(value);`);
             }
             ret.push(`  }`);
             if (prop.ref) {
                 ret.push(`  if (!entity${entityKey}) {`);
                 ret.push(`    entity${entityKey} = new ScalarReference();`);
-                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.bind(entity, ${this.quote(prop.name)});`);
                 ret.push(`  }`);
             }
             return ret;
@@ -158,8 +158,8 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                 const meta2 = this.metadata.get(prop.type);
                 const prop2 = meta2.properties[prop.inversedBy || prop.mappedBy];
                 if (prop2 && !prop2.mapToPk) {
-                    ret.push(`  if (data${dataKey} && entity${entityKey} && !entity${entityKey}.${this.safeKey(prop2.name)}) {`);
-                    ret.push(`    entity${entityKey}.${prop.ref ? 'unwrap().' : ''}${this.safeKey(prop2.name)} = ${prop2.ref ? 'Reference.create(entity)' : 'entity'};`);
+                    ret.push(`  if (data${dataKey} && entity${entityKey} && !entity${entityKey}${this.wrap(prop2.name)}) {`);
+                    ret.push(`    entity${entityKey}${prop.ref ? '.unwrap()' : ''}${this.wrap(prop2.name)} = ${prop2.ref ? 'Reference.create(entity)' : 'entity'};`);
                     ret.push(`  }`);
                 }
             }
@@ -179,7 +179,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             ret.push(`  }`);
             ret.push(`  if (Array.isArray(data${dataKey})) {`);
             ret.push(`    const items = data${dataKey}.map(value => createCollectionItem_${this.safeKey(prop.name)}(value, entity));`);
-            ret.push(`    const coll = Collection.create(entity, '${prop.name}', items, newEntity);`);
+            ret.push(`    const coll = Collection.create(entity, ${this.quote(prop.name)}, items, newEntity);`);
             ret.push(`    if (newEntity) {`);
             ret.push(`      coll.setDirty();`);
             ret.push(`    } else {`);
@@ -190,11 +190,11 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             if (!this.platform.usesPivotTable() && prop.owner && prop.kind === enums_1.ReferenceKind.MANY_TO_MANY) {
                 ret.push(`  } else if (!entity${entityKey} && Array.isArray(data${dataKey})) {`);
                 const items = this.platform.usesPivotTable() || !prop.owner ? 'undefined' : '[]';
-                ret.push(`    const coll = Collection.create(entity, '${prop.name}', ${items}, !!data${dataKey} || newEntity);`);
+                ret.push(`    const coll = Collection.create(entity, ${this.quote(prop.name)}, ${items}, !!data${dataKey} || newEntity);`);
                 ret.push(`    coll.setDirty(false);`);
             }
             ret.push(`  } else if (!entity${entityKey}) {`);
-            ret.push(`    const coll = Collection.create(entity, '${prop.name}', undefined, newEntity);`);
+            ret.push(`    const coll = Collection.create(entity, ${this.quote(prop.name)}, undefined, newEntity);`);
             ret.push(`    coll.setDirty(false);`);
             ret.push(`  }`);
             return ret;
@@ -247,7 +247,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             else {
                 ret.push(`    const embeddedData = {`);
                 for (const childProp of Object.values(prop.embeddedProps)) {
-                    const key = childProp.embedded[1].match(/^\w+$/) ? childProp.embedded[1] : `'${childProp.embedded[1]}'`;
+                    const key = this.objectKey(childProp.embedded[1]);
                     ret.push(`      ${key}: data${this.wrap(childProp.name)},`);
                 }
                 ret.push(`    };`);
@@ -361,8 +361,8 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         lines.push(`  const createCollectionItem_${this.safeKey(prop.name)} = (value, entity) => {`);
         const prop2 = prop.targetMeta.properties[prop.mappedBy];
         if (prop.kind === enums_1.ReferenceKind.ONE_TO_MANY && prop2.primary) {
-            lines.push(`    if (typeof value === 'object' && value?.['${prop2.name}'] == null) {`);
-            lines.push(`      value = { ...value, ['${prop2.name}']: Reference.wrapReference(entity, { ref: ${prop2.ref} }) };`);
+            lines.push(`    if (typeof value === 'object' && value?.[${this.quote(prop2.name)}] == null) {`);
+            lines.push(`      value = { ...value, [${this.quote(prop2.name)}]: Reference.wrapReference(entity, { ref: ${prop2.ref} }) };`);
             lines.push(`    }`);
         }
         lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference('${prop.type}', value, { convertCustomTypes, schema, normalizeAccessors, merge: true });`);
@@ -372,10 +372,18 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         return lines;
     }
     wrap(key) {
-        if (key.match(/^\[.*]$/)) {
+        if (key.match(/^\[idx_\d+]$/)) {
             return key;
         }
-        return key.match(/^\w+$/) ? `.${key}` : `['${key}']`;
+        return key.match(/^\w+$/) ? `.${key}` : `[${this.quote(key)}]`;
+    }
+    /** Renders a key as a single-quoted JS string literal, safe to embed in generated code. */
+    quote(key) {
+        return `'${key.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
+    }
+    /** Renders a key as an object literal key, quoted unless it is a plain identifier. */
+    objectKey(key) {
+        return key.match(/^\w+$/) ? key : this.quote(key);
     }
     safeKey(key) {
         return key.replace(/\W/g, '_');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.6.18-dev.0",
+  "version": "6.6.18-dev.2",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.3",
     "globby": "11.1.0",
-    "mikro-orm": "6.6.18-dev.0",
+    "mikro-orm": "6.6.18-dev.2",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/EntityComparator.d.ts

@@ -83,6 +83,10 @@ export declare class EntityComparator {
     private getGenericComparator;
     private getPropertyComparator;
     private wrap;
+    /** Renders a key as a single-quoted JS string literal, safe to embed in generated code. */
+    private quote;
+    /** Renders a key as an object literal key, quoted unless it is a plain identifier. */
+    private objectKey;
     private safeKey;
     /**
      * perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison

package/utils/EntityComparator.js

@@ -63,14 +63,14 @@ class EntityComparator {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`);
+                    lines.push(`    ${this.objectKey(pk)}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`);
                 }
                 else {
-                    lines.push(`    ${pk}: entity${this.wrap(pk)},`);
+                    lines.push(`    ${this.objectKey(pk)}: entity${this.wrap(pk)},`);
                 }
             });
             lines.push(`  };`);
-            lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
+            lines.push(`  if (${meta.primaryKeys.map(pk => `cond${this.wrap(pk)} == null`).join(' || ')}) return null;`);
             lines.push(`  return cond;`);
         }
         else {
@@ -114,20 +114,20 @@ class EntityComparator {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== enums_1.ReferenceKind.SCALAR) {
-                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`);
+                    lines.push(`    ${this.objectKey(pk)}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`);
                 }
                 else {
                     if (meta.properties[pk].customType) {
                         const convertorKey = this.registerCustomType(meta.properties[pk], context);
-                        lines.push(`    ${pk}: convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)}),`);
+                        lines.push(`    ${this.objectKey(pk)}: convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)}),`);
                     }
                     else {
-                        lines.push(`    ${pk}: entity${this.wrap(pk)},`);
+                        lines.push(`    ${this.objectKey(pk)}: entity${this.wrap(pk)},`);
                     }
                 }
             });
             lines.push(`  };`);
-            lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
+            lines.push(`  if (${meta.primaryKeys.map(pk => `cond${this.wrap(pk)} == null`).join(' || ')}) return null;`);
             lines.push(`  return cond;`);
         }
         else {
@@ -161,7 +161,8 @@ class EntityComparator {
         const lines = [];
         const context = new Map();
         context.set('isEntityOrRef', (val) => Utils_1.Utils.isEntity(val, true));
-        context.set('getCompositeKeyValue', (val) => Utils_1.Utils.flatten(Utils_1.Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.platform)));
+        // deep flatten, nested composite PKs produce nested arrays that would be comma-joined by the hash
+        context.set('getCompositeKeyValue', (val) => Utils_1.Utils.flatten(Utils_1.Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.platform), true));
         context.set('getPrimaryKeyHash', (val) => Utils_1.Utils.getPrimaryKeyHash(Utils_1.Utils.asArray(val)));
         if (meta.primaryKeys.length > 1) {
             lines.push(`  const pks = entity.__helper.__pk ? getCompositeKeyValue(entity.__helper.__pk) : [`);
@@ -184,7 +185,7 @@ class EntityComparator {
             }
             const serializedPrimaryKey = meta.props.find(p => p.serializedPrimaryKey);
             if (serializedPrimaryKey) {
-                lines.push(`  return '' + entity.${serializedPrimaryKey.name};`);
+                lines.push(`  return '' + entity${this.wrap(serializedPrimaryKey.name)};`);
             }
             else if (prop.customType) {
                 const convertorKey = this.registerCustomType(meta.properties[pk], context);
@@ -651,10 +652,18 @@ class EntityComparator {
         return this.getGenericComparator(this.wrap(prop.name), `!equals(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
     }
     wrap(key) {
-        if (key.match(/^\[.*]$/)) {
+        if (key.match(/^\[idx_\d+]$/)) {
             return key;
         }
-        return key.match(/^\w+$/) ? `.${key}` : `['${key}']`;
+        return key.match(/^\w+$/) ? `.${key}` : `[${this.quote(key)}]`;
+    }
+    /** Renders a key as a single-quoted JS string literal, safe to embed in generated code. */
+    quote(key) {
+        return `'${key.replace(/\\/g, '\\\\').replace(/'/g, "\\'")}'`;
+    }
+    /** Renders a key as an object literal key, quoted unless it is a plain identifier. */
+    objectKey(key) {
+        return key.match(/^\w+$/) ? key : this.quote(key);
     }
     safeKey(key) {
         return key.replace(/\W/g, '_');

package/utils/Utils.js

@@ -503,7 +503,8 @@ class Utils {
     static getCompositeKeyHash(data, meta, convertCustomTypes = false, platform, flat = false) {
         let pks = this.getCompositeKeyValue(data, meta, convertCustomTypes, platform);
         if (flat) {
-            pks = Utils.flatten(pks);
+            // deep flatten, nested composite PKs produce nested arrays that would be comma-joined by the hash
+            pks = Utils.flatten(pks, true);
         }
         return Utils.getPrimaryKeyHash(pks);
     }