@nymphjs/nymph 1.0.0-alpha.9 → 1.0.0-beta.0

package/src/driver/testArtifacts.ts

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import strtotime from 'locutus/php/datetime/strtotime';
+import { guid } from '@nymphjs/guid';
 
 import type Nymph from '../Nymph';
-import newGUID from '../newGUID';
 import { TestBModel, TestModel, TestModelData } from '../testArtifacts';
 
 export function QueriesTest(
@@ -131,7 +131,7 @@ This one's zip code is 92064.`;
     expect(testEntity.$is(resultEntity)).toEqual(true);
 
     // Testing wrong GUID...
-    resultEntity = await nymph.getEntity({ class: TestModel }, newGUID());
+    resultEntity = await nymph.getEntity({ class: TestModel }, guid());
     expect(testEntity.$is(resultEntity)).toEqual(false);
   });
 
@@ -259,7 +259,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by GUID and tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '|', guid: [testGuid, newGUID()] }
+      { type: '|', guid: [testGuid, guid()] }
     );
     expect(testEntity.$is(resultEntity)).toEqual(true);
   });
@@ -270,7 +270,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by GUID and tags...
     const resultEntity = await nymph.getEntity(
       { class: TestModel },
-      { type: '|', guid: [newGUID(), newGUID()] }
+      { type: '|', guid: [guid(), guid()] }
     );
     expect(testEntity.$is(resultEntity)).toEqual(false);
   });
@@ -281,7 +281,7 @@ This one's zip code is 92064.`;
     // Retrieving entity by !GUID...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', '!guid': newGUID(), tag: 'test' }
+      { type: '&', '!guid': guid(), tag: 'test' }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1185,7 +1185,7 @@ This one's zip code is 92064.`;
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
       { type: '&', tag: 'test' },
-      { type: '!&', ref: ['reference', newGUID()] }
+      { type: '!&', ref: ['reference', guid()] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
@@ -1196,7 +1196,7 @@ This one's zip code is 92064.`;
     // Testing wrong reference...
     const resultEntity = await nymph.getEntities(
       { class: TestModel },
-      { type: '&', ref: ['reference', newGUID()] }
+      { type: '&', ref: ['reference', guid()] }
     );
     expect(testEntity.$inArray(resultEntity)).toEqual(false);
   });
@@ -1222,7 +1222,7 @@ This one's zip code is 92064.`;
         type: '|',
         ref: [
           ['reference', refGuid],
-          ['reference', newGUID()],
+          ['reference', guid()],
         ],
       }
     );
@@ -1238,8 +1238,8 @@ This one's zip code is 92064.`;
       {
         type: '|',
         ref: [
-          ['reference', newGUID()],
-          ['reference', newGUID()],
+          ['reference', guid()],
+          ['reference', guid()],
         ],
       }
     );
@@ -1267,7 +1267,7 @@ This one's zip code is 92064.`;
         type: '&',
         ref: [
           ['refArray', refGuid],
-          ['refArray', newGUID()],
+          ['refArray', guid()],
         ],
       }
     );
@@ -1283,8 +1283,8 @@ This one's zip code is 92064.`;
       {
         type: '&',
         '!ref': [
-          ['refArray', newGUID()],
-          ['refArray', newGUID()],
+          ['refArray', guid()],
+          ['refArray', guid()],
         ],
         '!lte': ['number', 29.99],
       },
@@ -1319,6 +1319,55 @@ This one's zip code is 92064.`;
     expect(testEntity.$inArray(resultEntity)).toEqual(true);
   });
 
+  it('count return', async () => {
+    await createTestEntities();
+
+    const result = await nymph.getEntities({ class: TestModel });
+
+    // Testing count return...
+    const resultCount = await nymph.getEntities({
+      class: TestModel,
+      return: 'count',
+    });
+    expect(resultCount).toBeGreaterThanOrEqual(1);
+    expect(resultCount).toEqual(result.length);
+
+    const resultSelectors = await nymph.getEntities(
+      { class: TestModel },
+      { type: '&', ref: ['reference', refGuid] }
+    );
+
+    // Testing count return with selectors...
+    const resultSelectorsCount = await nymph.getEntities(
+      { class: TestModel, return: 'count' },
+      { type: '&', ref: ['reference', refGuid] }
+    );
+    expect(resultSelectorsCount).toBeGreaterThanOrEqual(1);
+    expect(resultSelectorsCount).toEqual(resultSelectors.length);
+
+    // Testing count return with limit...
+    const resultSelectorsLimit = await nymph.getEntities({
+      class: TestModel,
+      limit: 1,
+      return: 'count',
+    });
+    expect(resultSelectorsLimit).toEqual(1);
+
+    // Testing count return with limit...
+    const resultSelectorsSingle = await nymph.getEntity({
+      class: TestModel,
+      return: 'count',
+    });
+    expect(resultSelectorsSingle).toEqual(1);
+
+    // Testing empty count...
+    const resultSelectorsEmpty = await nymph.getEntities(
+      { class: TestModel, return: 'count' },
+      { type: '&', ref: ['reference', guid()] }
+    );
+    expect(resultSelectorsEmpty).toEqual(0);
+  });
+
   it('guid return', async () => {
     await createTestEntities();
 
@@ -1328,8 +1377,8 @@ This one's zip code is 92064.`;
       {
         type: '&',
         '!ref': [
-          ['refArray', newGUID()],
-          ['refArray', newGUID()],
+          ['refArray', guid()],
+          ['refArray', guid()],
         ],
         '!lte': ['number', 29.99],
       },
@@ -1373,8 +1422,8 @@ This one's zip code is 92064.`;
       {
         type: '&',
         '!ref': [
-          ['refArray', newGUID()],
-          ['refArray', newGUID()],
+          ['refArray', guid()],
+          ['refArray', guid()],
         ],
         '!lte': ['number', 29.99],
       },
@@ -1418,8 +1467,8 @@ This one's zip code is 92064.`;
       {
         type: '&',
         '!ref': [
-          ['refArray', newGUID()],
-          ['refArray', newGUID()],
+          ['refArray', guid()],
+          ['refArray', guid()],
         ],
         '!lte': ['number', 29.99],
       },
@@ -1465,7 +1514,7 @@ This one's zip code is 92064.`;
         selector: [
           {
             type: '&',
-            '!ref': ['refArray', newGUID()],
+            '!ref': ['refArray', guid()],
             '!lte': ['number', 29.99],
           },
           { type: '&', gte: ['number', 16000] },
@@ -1481,7 +1530,7 @@ This one's zip code is 92064.`;
         selector: [
           {
             type: '&',
-            '!ref': ['refArray', newGUID()],
+            '!ref': ['refArray', guid()],
             '!lte': ['number', 29.99],
           },
           {
@@ -1506,7 +1555,7 @@ This one's zip code is 92064.`;
         selector: [
           {
             type: '&',
-            '!ref': ['refArray', newGUID()],
+            '!ref': ['refArray', guid()],
             '!lte': ['number', 29.99],
           },
           { type: '&', gte: ['number', 16000] },

package/src/index.ts

@@ -8,9 +8,6 @@ export * from './Entity';
 import Entity from './Entity';
 export { Entity };
 
-import newGUID from './newGUID';
-export { newGUID };
-
 export * from './Nymph.types';
 
 export * from './Nymph';

package/src/nymphJoiProps.ts

@@ -15,12 +15,10 @@ export default {
     .required(),
   tags: Joi.array()
     .items(
-      Joi.string()
-        .pattern(/[[\x01-\x1F\x7F]]/, {
-          name: 'control characters',
-          invert: true,
-        })
-        .min(1)
+      Joi.string().pattern(/[[\x01-\x1F\x7F]]/, {
+        name: 'control characters',
+        invert: true,
+      })
     )
     .required(),
 };

package/src/testMocks.ts

@@ -1,7 +1,8 @@
+import { guid } from '@nymphjs/guid';
+
 import type Nymph from './Nymph';
 import { EntityConstructor, EntityInterface, EntityJson } from './Entity.types';
 import { Options, Selector } from './Nymph.types';
-import newGUID from './newGUID';
 import { ClassNotAvailableError } from './errors';
 import Entity from './Entity';
 
@@ -108,7 +109,7 @@ export class MockNymph {
     const className = (entity.constructor as any).class as string;
 
     if (entity.guid == null) {
-      entity.guid = newGUID();
+      entity.guid = guid();
       entity.cdate = Date.now();
     } else if (
       entity.guid in entities &&

package/src/utils.ts

@@ -1,6 +1,7 @@
 import Entity from './Entity';
 import { EntityReference } from './Entity.types';
 import Nymph from './Nymph';
+import { Options, Selector } from './Nymph.types';
 
 export function xor(a: any, b: any): boolean {
   return !!(a && !b) || (!a && b);
@@ -14,6 +15,64 @@ export function uniqueStrings(array: string[]) {
   return Object.keys(obj);
 }
 
+export function classNamesToEntityConstructors(
+  nymph: Nymph,
+  selectors: Selector[]
+): 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 =
+            typeof qrefOptions.class === 'string'
+              ? nymph.getEntityClass(qrefOptions.class)
+              : qrefOptions.class ?? nymph.getEntityClass('Entity');
+          const options = { ...qrefOptions, class: QrefEntityClass };
+          if (!newSelector[key]) {
+            newSelector[key] = [];
+          }
+          (newSelector[key] as [string, [Options, ...Selector[]]][]).push([
+            name,
+            [options, ...classNamesToEntityConstructors(nymph, selectors)],
+          ]);
+        }
+      } else if (key === 'selector' || key === '!selector') {
+        const tmpArr = (Array.isArray(value) ? value : [value]) as Selector[];
+        newSelector[key] = classNamesToEntityConstructors(nymph, tmpArr);
+      } else {
+        // @ts-ignore: ts doesn't know what value is here.
+        newSelector[key] = value;
+      }
+    }
+
+    newSelectors.push(newSelector);
+  }
+
+  return newSelectors;
+}
+
 export function entitiesToReferences(item: any): any {
   if (item instanceof Entity && typeof item.$toReference === 'function') {
     // Convert entities to references.

package/dist/newGUID.d.ts

@@ -1 +0,0 @@
-export default function newGUID(): string;

package/dist/newGUID.js

@@ -1,14 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const nanoid_1 = require("nanoid");
-const luxon_1 = require("luxon");
-const sha1_1 = __importDefault(require("sha1"));
-const nanoid = (0, nanoid_1.customAlphabet)('0123456789abcdef', 20);
-function newGUID() {
-    return `${(0, sha1_1.default)(`${luxon_1.DateTime.now().weekYear}${luxon_1.DateTime.now().weekNumber}`).slice(0, 4)}${nanoid()}`;
-}
-exports.default = newGUID;
-//# sourceMappingURL=newGUID.js.map

package/dist/newGUID.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"newGUID.js","sourceRoot":"","sources":["../src/newGUID.ts"],"names":[],"mappings":";;;;;AAAA,mCAAwC;AACxC,iCAAiC;AACjC,gDAAwB;AAExB,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;AAEtD,SAAwB,OAAO;IAC7B,OAAO,GAAG,IAAA,cAAI,EACZ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CACzD,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC;AAC7B,CAAC;AAJD,0BAIC"}

package/src/newGUID.ts

@@ -1,11 +0,0 @@
-import { customAlphabet } from 'nanoid';
-import { DateTime } from 'luxon';
-import sha1 from 'sha1';
-
-const nanoid = customAlphabet('0123456789abcdef', 20);
-
-export default function newGUID() {
-  return `${sha1(
-    `${DateTime.now().weekYear}${DateTime.now().weekNumber}`
-  ).slice(0, 4)}${nanoid()}`;
-}