@mikro-orm/core 7.2.1-dev.22 → 7.2.1-dev.23

package/hydration/ObjectHydrator.d.ts

@@ -21,6 +21,8 @@ export declare class ObjectHydrator extends Hydrator {
     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

@@ -151,7 +151,7 @@ export class ObjectHydrator extends Hydrator {
                 : `isPrimaryKey(data${dataKey}, true)`;
             ret.push(`    if (${pkCheck}) {`);
             // When targetKey is set, pass the key option to createReference so it uses the alternate key
-            const keyOption = prop.targetKey ? `, key: '${prop.targetKey}'` : '';
+            const keyOption = prop.targetKey ? `, key: ${this.quote(prop.targetKey)}` : '';
             if (prop.polymorphic) {
                 // For polymorphic: target class from discriminator map, PK from data.id
                 const discriminatorMapKey = this.safeKey(`discriminatorMap_${prop.name}_${this.#tmpIndex++}`);
@@ -199,8 +199,8 @@ export class ObjectHydrator extends Hydrator {
                 const meta2 = this.metadata.get(prop.targetMeta.class);
                 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(`  }`);
                 }
             }
@@ -291,7 +291,7 @@ export class ObjectHydrator extends Hydrator {
             else {
                 ret.push(`    const embeddedData = {`);
                 for (const childProp of Object.values(prop.embeddedProps)) {
-                    const key = /^\w+$/.exec(childProp.embedded[1]) ? childProp.embedded[1] : `'${childProp.embedded[1]}'`;
+                    const key = this.objectKey(childProp.embedded[1]);
                     ret.push(`      ${key}: data${this.wrap(childProp.name)},`);
                 }
                 ret.push(`    };`);
@@ -418,8 +418,8 @@ export class ObjectHydrator extends Hydrator {
         lines.push(`  const createCollectionItem_${this.safeKey(prop.name)} = (value, entity) => {`);
         const prop2 = prop.targetMeta.properties[prop.mappedBy];
         if (prop.kind === 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(`    }`);
         }
         const targetKey = this.safeKey(`${prop.targetMeta.tableName}_${this.#tmpIndex++}`);
@@ -440,6 +440,10 @@ export class ObjectHydrator extends Hydrator {
     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 /^\w+$/.exec(key) ? key : this.quote(key);
+    }
     safeKey(key) {
         return key.replace(/\W/g, '_');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.1-dev.22",
+  "version": "7.2.1-dev.23",
   "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",

package/utils/EntityComparator.d.ts

@@ -82,6 +82,8 @@ export declare class EntityComparator {
     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;
     /**
      * Sets the toArray helper in the context if not already set.

package/utils/EntityComparator.js

@@ -65,14 +65,14 @@ export class EntityComparator {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== 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 {
@@ -116,20 +116,20 @@ export class EntityComparator {
             lines.push(`  const cond = {`);
             meta.primaryKeys.forEach(pk => {
                 if (meta.properties[pk].kind !== 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 {
@@ -193,7 +193,7 @@ export 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);
@@ -617,6 +617,8 @@ export class EntityComparator {
             else if (prop.targetKey) {
                 // When targetKey is set, extract that property value instead of the PK
                 const targetProp = prop.targetMeta?.properties[prop.targetKey];
+                // `wrap()` yields `.name` or `['name']`, optional chaining needs the dot in both forms
+                const targetAccess = `?${this.wrap(prop.targetKey).replace(/^\[/, '.[')}`;
                 ret += `    if (entity${entityKey} === null) {\n`;
                 ret += `      ret${dataKey} = null;\n`;
                 ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
@@ -624,10 +626,10 @@ export class EntityComparator {
                 if (targetProp?.customType) {
                     // If targetKey property has a custom type, convert to database value
                     const convertorKey = this.registerCustomType(targetProp, context);
-                    ret += `      ret${dataKey} = convertToDatabaseValue_${convertorKey}(val${level}?.${prop.targetKey});\n`;
+                    ret += `      ret${dataKey} = convertToDatabaseValue_${convertorKey}(val${level}${targetAccess});\n`;
                 }
                 else {
-                    ret += `      ret${dataKey} = val${level}?.${prop.targetKey};\n`;
+                    ret += `      ret${dataKey} = val${level}${targetAccess};\n`;
                 }
                 ret += `    }\n`;
             }
@@ -767,6 +769,10 @@ export class EntityComparator {
     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 /^\w+$/.exec(key) ? key : this.quote(key);
+    }
     safeKey(key) {
         return key.replace(/\W/g, '_');
     }

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.1-dev.22';
+    static #ORM_VERSION = '7.2.1-dev.23';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;