@mikro-orm/core 7.0.2 → 7.0.3-dev.0

package/entity/utils.d.ts

@@ -3,25 +3,15 @@ import { LoadStrategy, ReferenceKind } from '../enums.js';
 /**
  * @internal
  */
-export declare function expandDotPaths<Entity>(
-  meta: EntityMetadata<Entity>,
-  populate?: readonly (string | PopulateOptions<Entity>)[],
-  normalized?: boolean,
-): PopulateOptions<Entity>[];
+export declare function expandDotPaths<Entity>(meta: EntityMetadata<Entity>, populate?: readonly (string | PopulateOptions<Entity>)[], normalized?: boolean): PopulateOptions<Entity>[];
 /**
  * Returns the loading strategy based on the provided hint.
  * If `BALANCED` strategy is used, it will return JOINED if the property is a to-one relation.
  * @internal
  */
-export declare function getLoadingStrategy(
-  strategy: LoadStrategy | `${LoadStrategy}`,
-  kind: ReferenceKind,
-): LoadStrategy.SELECT_IN | LoadStrategy.JOINED;
+export declare function getLoadingStrategy(strategy: LoadStrategy | `${LoadStrategy}`, kind: ReferenceKind): LoadStrategy.SELECT_IN | LoadStrategy.JOINED;
 /**
  * Applies per-relation overrides from `populateHints` to the normalized populate tree.
  * @internal
  */
-export declare function applyPopulateHints<Entity>(
-  populate: PopulateOptions<Entity>[],
-  hints: Record<string, PopulateHintOptions>,
-): void;
+export declare function applyPopulateHints<Entity>(populate: PopulateOptions<Entity>[], hints: Record<string, PopulateHintOptions>): void;

package/entity/utils.js

@@ -4,55 +4,57 @@ import { Utils } from '../utils/Utils.js';
  * Expands `books.perex` like populate to use `children` array instead of the dot syntax
  */
 function expandNestedPopulate(parentProp, parts, strategy, all) {
-  const meta = parentProp.targetMeta;
-  const field = parts.shift();
-  const prop = meta.properties[field];
-  const ret = { field, strategy, all };
-  if (parts.length > 0) {
-    ret.children = [expandNestedPopulate(prop, parts, strategy)];
-  }
-  return ret;
+    const meta = parentProp.targetMeta;
+    const field = parts.shift();
+    const prop = meta.properties[field];
+    const ret = { field, strategy, all };
+    if (parts.length > 0) {
+        ret.children = [expandNestedPopulate(prop, parts, strategy)];
+    }
+    return ret;
 }
 /**
  * @internal
  */
 export function expandDotPaths(meta, populate, normalized = false) {
-  const ret = normalized
-    ? populate
-    : Utils.asArray(populate).map(field => {
-        if (typeof field === 'string') {
-          return { field };
+    const ret = normalized
+        ? populate
+        : Utils.asArray(populate).map(field => {
+            if (typeof field === 'string') {
+                return { field };
+            }
+            /* v8 ignore next */
+            return typeof field === 'boolean' || field.field === PopulatePath.ALL
+                ? { all: !!field, field: meta.primaryKeys[0] }
+                : field;
+        });
+    for (const p of ret) {
+        if (!p.field.includes('.')) {
+            continue;
+        }
+        const [f, ...parts] = p.field.split('.');
+        p.field = f;
+        p.children ??= [];
+        const prop = meta.properties[p.field];
+        if (parts[0] === PopulatePath.ALL) {
+            prop
+                .targetMeta.props.filter(prop => prop.lazy || prop.kind !== ReferenceKind.SCALAR)
+                .forEach(prop => p.children.push({ field: prop.name, strategy: p.strategy }));
+        }
+        else if (prop.kind === ReferenceKind.EMBEDDED) {
+            const embeddedProp = Object.values(prop.embeddedProps).find(c => c.embedded[1] === parts[0]);
+            ret.push({
+                ...p,
+                field: embeddedProp.name,
+                children: parts.length > 1 ? [expandNestedPopulate(embeddedProp, parts.slice(1), p.strategy, p.all)] : [],
+            });
+            p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
+        }
+        else {
+            p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
         }
-        /* v8 ignore next */
-        return typeof field === 'boolean' || field.field === PopulatePath.ALL
-          ? { all: !!field, field: meta.primaryKeys[0] }
-          : field;
-      });
-  for (const p of ret) {
-    if (!p.field.includes('.')) {
-      continue;
-    }
-    const [f, ...parts] = p.field.split('.');
-    p.field = f;
-    p.children ??= [];
-    const prop = meta.properties[p.field];
-    if (parts[0] === PopulatePath.ALL) {
-      prop.targetMeta.props
-        .filter(prop => prop.lazy || prop.kind !== ReferenceKind.SCALAR)
-        .forEach(prop => p.children.push({ field: prop.name, strategy: p.strategy }));
-    } else if (prop.kind === ReferenceKind.EMBEDDED) {
-      const embeddedProp = Object.values(prop.embeddedProps).find(c => c.embedded[1] === parts[0]);
-      ret.push({
-        ...p,
-        field: embeddedProp.name,
-        children: parts.length > 1 ? [expandNestedPopulate(embeddedProp, parts.slice(1), p.strategy, p.all)] : [],
-      });
-      p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
-    } else {
-      p.children.push(expandNestedPopulate(prop, parts, p.strategy, p.all));
     }
-  }
-  return ret;
+    return ret;
 }
 /**
  * Returns the loading strategy based on the provided hint.
@@ -60,43 +62,43 @@ export function expandDotPaths(meta, populate, normalized = false) {
  * @internal
  */
 export function getLoadingStrategy(strategy, kind) {
-  if (strategy === LoadStrategy.BALANCED) {
-    return [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(kind)
-      ? LoadStrategy.JOINED
-      : LoadStrategy.SELECT_IN;
-  }
-  return strategy;
+    if (strategy === LoadStrategy.BALANCED) {
+        return [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(kind)
+            ? LoadStrategy.JOINED
+            : LoadStrategy.SELECT_IN;
+    }
+    return strategy;
 }
 function findPopulateEntry(populate, parts) {
-  let current = populate;
-  for (let i = 0; i < parts.length; i++) {
-    const entry = current.find(p => p.field.split(':')[0] === parts[i]);
-    if (!entry) {
-      return undefined;
-    }
-    if (i === parts.length - 1) {
-      return entry;
+    let current = populate;
+    for (let i = 0; i < parts.length; i++) {
+        const entry = current.find(p => p.field.split(':')[0] === parts[i]);
+        if (!entry) {
+            return undefined;
+        }
+        if (i === parts.length - 1) {
+            return entry;
+        }
+        current = (entry.children ?? []);
     }
-    current = entry.children ?? [];
-  }
-  /* v8 ignore next */
-  return undefined;
+    /* v8 ignore next */
+    return undefined;
 }
 /**
  * Applies per-relation overrides from `populateHints` to the normalized populate tree.
  * @internal
  */
 export function applyPopulateHints(populate, hints) {
-  for (const [path, hint] of Object.entries(hints)) {
-    const entry = findPopulateEntry(populate, path.split('.'));
-    if (!entry) {
-      continue;
-    }
-    if (hint.strategy != null) {
-      entry.strategy = hint.strategy;
-    }
-    if (hint.joinType != null) {
-      entry.joinType = hint.joinType;
+    for (const [path, hint] of Object.entries(hints)) {
+        const entry = findPopulateEntry(populate, path.split('.'));
+        if (!entry) {
+            continue;
+        }
+        if (hint.strategy != null) {
+            entry.strategy = hint.strategy;
+        }
+        if (hint.joinType != null) {
+            entry.joinType = hint.joinType;
+        }
     }
-  }
 }

package/entity/validators.js

@@ -4,63 +4,63 @@ import { isRaw, Raw } from '../utils/RawQueryFragment.js';
 import { SCALAR_TYPES } from '../enums.js';
 /** @internal */
 export function validateProperty(prop, givenValue, entity) {
-  if (givenValue == null || isRaw(givenValue)) {
-    return;
-  }
-  const expectedType = prop.runtimeType;
-  const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
-  const givenType = Utils.getObjectType(givenValue);
-  if (prop.enum && prop.items) {
-    /* v8 ignore next */
-    if (!prop.items.some(it => it === givenValue)) {
-      throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
+    if (givenValue == null || isRaw(givenValue)) {
+        return;
+    }
+    const expectedType = prop.runtimeType;
+    const propName = prop.embedded ? prop.name.replace(/~/g, '.') : prop.name;
+    const givenType = Utils.getObjectType(givenValue);
+    if (prop.enum && prop.items) {
+        /* v8 ignore next */
+        if (!prop.items.some(it => it === givenValue)) {
+            throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
+        }
     }
-  } else {
-    if (givenType !== expectedType && SCALAR_TYPES.has(expectedType)) {
-      throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
+    else {
+        if (givenType !== expectedType && SCALAR_TYPES.has(expectedType)) {
+            throw ValidationError.fromWrongPropertyType(entity, propName, expectedType, givenType, givenValue);
+        }
     }
-  }
 }
 function getValue(o, prop) {
-  if (prop.embedded && prop.embedded[0] in o) {
-    return o[prop.embedded[0]]?.[prop.embedded[1]];
-  }
-  /* v8 ignore next */
-  if (prop.ref) {
-    return o[prop.name]?.unwrap();
-  }
-  return o[prop.name];
+    if (prop.embedded && prop.embedded[0] in o) {
+        return o[prop.embedded[0]]?.[prop.embedded[1]];
+    }
+    /* v8 ignore next */
+    if (prop.ref) {
+        return o[prop.name]?.unwrap();
+    }
+    return o[prop.name];
 }
 /** @internal */
 export function validateEntity(entity, meta) {
-  for (const prop of meta.validateProps) {
-    validateProperty(prop, getValue(entity, prop), entity);
-  }
+    for (const prop of meta.validateProps) {
+        validateProperty(prop, getValue(entity, prop), entity);
+    }
 }
 /** @internal */
 export function validateParams(params, type = 'search condition', field) {
-  if (Utils.isPrimaryKey(params) || Utils.isEntity(params)) {
-    return;
-  }
-  if (Array.isArray(params)) {
-    return params.forEach(item => validateParams(item, type, field));
-  }
-  if (Utils.isPlainObject(params)) {
-    Object.keys(params).forEach(k => validateParams(params[k], type, k));
-  }
+    if (Utils.isPrimaryKey(params) || Utils.isEntity(params)) {
+        return;
+    }
+    if (Array.isArray(params)) {
+        return params.forEach(item => validateParams(item, type, field));
+    }
+    if (Utils.isPlainObject(params)) {
+        Object.keys(params).forEach(k => validateParams(params[k], type, k));
+    }
 }
 /** @internal */
 export function validatePrimaryKey(entity, meta) {
-  const pkExists =
-    meta.primaryKeys.every(pk => entity[pk] != null) ||
-    (meta.serializedPrimaryKey && entity[meta.serializedPrimaryKey] != null);
-  if (!entity || !pkExists) {
-    throw ValidationError.fromMergeWithoutPK(meta);
-  }
+    const pkExists = meta.primaryKeys.every(pk => entity[pk] != null) ||
+        (meta.serializedPrimaryKey && entity[meta.serializedPrimaryKey] != null);
+    if (!entity || !pkExists) {
+        throw ValidationError.fromMergeWithoutPK(meta);
+    }
 }
 /** @internal */
 export function validateEmptyWhere(where) {
-  if (Utils.isEmpty(where) && !Raw.hasObjectFragments(where)) {
-    throw new Error(`You cannot call 'EntityManager.findOne()' with empty 'where' parameter`);
-  }
+    if (Utils.isEmpty(where) && !Raw.hasObjectFragments(where)) {
+        throw new Error(`You cannot call 'EntityManager.findOne()' with empty 'where' parameter`);
+    }
 }

package/entity/wrap.js

@@ -3,13 +3,13 @@
  * use `preferHelper = true` to have access to the internal `__` properties like `__meta` or `__em`
  */
 export function wrap(entity, preferHelper = false) {
-  if (!entity) {
-    return entity;
-  }
-  if (entity.__baseEntity && !preferHelper) {
-    return entity;
-  }
-  return entity.__helper ?? entity;
+    if (!entity) {
+        return entity;
+    }
+    if (entity.__baseEntity && !preferHelper) {
+        return entity;
+    }
+    return entity.__helper ?? entity;
 }
 /**
  * wraps entity type with WrappedEntity internal properties and helpers like init/isInitialized/populated/toJSON
@@ -17,5 +17,5 @@ export function wrap(entity, preferHelper = false) {
  * @internal
  */
 export function helper(entity) {
-  return entity.__helper;
+    return entity.__helper;
 }