@nymphjs/nymph 1.0.0-beta.123 → 1.0.0-beta.125

package/src/utils.ts

@@ -1,7 +1,6 @@
 import Entity from './Entity.js';
 import { EntityReference } from './Entity.types.js';
 import Nymph from './Nymph.js';
-import { Options, Selector } from './Nymph.types.js';
 
 export function xor(a: any, b: any): boolean {
   return !!(a && !b) || (!a && b);
@@ -15,87 +14,83 @@ export function uniqueStrings(array: string[]) {
   return Object.keys(obj);
 }
 
-export function classNamesToEntityConstructors(
+export function entityConstructorsToClassNames(item: any): any {
+  if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
+    return item;
+  } else if (typeof item === 'function' && item.prototype instanceof Entity) {
+    // Convert entity classes to class references.
+    return ['nymph_class_reference', item.class];
+  } else if (item instanceof Entity) {
+    // Don't touch entities.
+    return item;
+  } else if (Array.isArray(item)) {
+    // Recurse into lower arrays.
+    return item.map((entry) => entityConstructorsToClassNames(entry));
+  } else if (item instanceof Object) {
+    let newObj = Object.create(item);
+    for (let [key, value] of Object.entries(item)) {
+      newObj[key] = entityConstructorsToClassNames(value);
+    }
+    return newObj;
+  }
+  // Not an entity or array, just return it.
+  return item;
+}
+
+export function classNamesToEntityConstructors<T extends any>(
   nymph: Nymph,
-  selectors: Selector[],
+  item: T,
   enforceRestEnabledFlag = false,
-): Selector[] {
-  const newSelectors: Selector[] = [];
-
-  for (const curSelector of selectors) {
-    const newSelector: Selector = { type: curSelector.type };
-
-    for (const k in curSelector) {
-      const key = k as keyof Selector;
-      const value = curSelector[key];
-
-      if (key === 'type') {
-        continue;
-      }
-
-      if (value === undefined) {
-        continue;
-      }
-
-      if (key === 'qref' || key === '!qref') {
-        const tmpArr = (
-          Array.isArray(((value as Selector['qref']) ?? [])[0])
-            ? value
-            : [value]
-        ) as [string, [Options, ...Selector[]]][];
-        for (let i = 0; i < tmpArr.length; i++) {
-          const name = tmpArr[i][0];
-          const [qrefOptions, ...selectors] = tmpArr[i][1];
-          const QrefEntityClass = qrefOptions.class
-            ? nymph.getEntityClass(qrefOptions.class)
-            : nymph.getEntityClass('Entity');
-          if (enforceRestEnabledFlag && !QrefEntityClass.restEnabled) {
-            throw new Error('Not accessible.');
-          }
-          const options = { ...qrefOptions, class: QrefEntityClass };
-          if (!newSelector[key]) {
-            newSelector[key] = [];
-          }
-          (newSelector[key] as [string, [Options, ...Selector[]]][]).push([
-            name,
-            [
-              options,
-              ...classNamesToEntityConstructors(
-                nymph,
-                selectors,
-                enforceRestEnabledFlag,
-              ),
-            ],
-          ]);
-        }
-      } else if (key === 'selector' || key === '!selector') {
-        const tmpArr = (Array.isArray(value) ? value : [value]) as Selector[];
-        newSelector[key] = classNamesToEntityConstructors(
-          nymph,
-          tmpArr,
-          enforceRestEnabledFlag,
-        );
-      } else {
-        // @ts-ignore: ts doesn't know what value is here.
-        newSelector[key] = value;
-      }
+): T {
+  if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
+    return item;
+  } else if (
+    Array.isArray(item) &&
+    item.length === 2 &&
+    item[0] === 'nymph_class_reference' &&
+    typeof item[1] === 'string'
+  ) {
+    // Convert class references to entity classes.
+    const EntityClass = nymph.getEntityClass(item[1]);
+    if (enforceRestEnabledFlag && !EntityClass.restEnabled) {
+      throw new Error('Not accessible.');
     }
-
-    newSelectors.push(newSelector);
+    return EntityClass as T;
+  } else if (item instanceof Entity) {
+    // Don't touch entities.
+    return item;
+  } else if (typeof item === 'function' && item.prototype instanceof Entity) {
+    // Don't touch Entity classes.
+    return item;
+  } else if (Array.isArray(item)) {
+    // Recurse into lower arrays.
+    return item.map((entry) =>
+      classNamesToEntityConstructors(nymph, entry, enforceRestEnabledFlag),
+    ) as T;
+  } else if (item instanceof Object) {
+    let newObj = Object.create(item);
+    for (let [key, value] of Object.entries(item)) {
+      newObj[key] = classNamesToEntityConstructors(
+        nymph,
+        value,
+        enforceRestEnabledFlag,
+      );
+    }
+    return newObj;
   }
-
-  return newSelectors;
+  // Not an entity or array, just return it.
+  return item;
 }
 
 export function entitiesToReferences(item: any, existingOnly?: boolean): any {
   if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
     return item;
-  } else if (
-    item instanceof Entity &&
-    typeof item.$toReference === 'function'
-  ) {
+  } else if (item instanceof Entity) {
     // Convert entities to references.
     return item.$toReference(existingOnly);
+  } else if (typeof item === 'function' && item.prototype instanceof Entity) {
+    // Don't touch Entity classes.
+    return item;
   } else if (Array.isArray(item)) {
     // Recurse into lower arrays.
     return item.map((entry) => entitiesToReferences(entry, existingOnly));
@@ -114,6 +109,7 @@ export function referencesToEntities(
   item: any,
   nymph: Nymph,
   useSkipAc = false,
+  enforceRestEnabledFlag = false,
 ): any {
   if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
     return item;
@@ -122,6 +118,9 @@ export function referencesToEntities(
     if (item[0] === 'nymph_entity_reference') {
       try {
         const EntityClass = nymph.getEntityClass(item[2]);
+        if (enforceRestEnabledFlag && !EntityClass.restEnabled) {
+          throw new Error('Not accessible.');
+        }
         const entity = EntityClass.factoryReference(item as EntityReference);
         entity.$useSkipAc(useSkipAc);
         entity.$nymph = nymph;
@@ -131,12 +130,27 @@ export function referencesToEntities(
       }
     } else {
       // Recurse into lower arrays.
-      return item.map((entry) => referencesToEntities(entry, nymph, useSkipAc));
+      return item.map((entry) =>
+        referencesToEntities(entry, nymph, useSkipAc, enforceRestEnabledFlag),
+      );
     }
-  } else if (Entity && item instanceof Object && !(item instanceof Entity)) {
+  } else if (item instanceof Entity) {
+    // Don't touch entities.
+    return item;
+  } else if (typeof item === 'function' && item.prototype instanceof Entity) {
+    // Don't touch Entity classes.
+    return item;
+  } else if (item instanceof Object) {
+    let newObj = Object.create(item);
     for (let [key, value] of Object.entries(item)) {
-      item[key] = referencesToEntities(value, nymph);
+      newObj[key] = referencesToEntities(
+        value,
+        nymph,
+        useSkipAc,
+        enforceRestEnabledFlag,
+      );
     }
+    return newObj;
   }
   // Not an array, just return it.
   return item;