@nymphjs/nymph 1.0.0-beta.12 → 1.0.0-beta.121

package/dist/utils.js

@@ -1,23 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortObj = exports.referencesToEntities = exports.entitiesToReferences = exports.classNamesToEntityConstructors = exports.uniqueStrings = exports.xor = void 0;
-const Entity_1 = __importDefault(require("./Entity"));
-function xor(a, b) {
+import Entity from './Entity.js';
+export function xor(a, b) {
     return !!(a && !b) || (!a && b);
 }
-exports.xor = xor;
-function uniqueStrings(array) {
+export function uniqueStrings(array) {
     const obj = {};
     for (let i = 0; i < array.length; ++i) {
         obj[array[i]] = true;
     }
     return Object.keys(obj);
 }
-exports.uniqueStrings = uniqueStrings;
-function classNamesToEntityConstructors(nymph, selectors) {
+export function classNamesToEntityConstructors(nymph, selectors, enforceRestEnabledFlag = false) {
     const newSelectors = [];
     for (const curSelector of selectors) {
         const newSelector = { type: curSelector.type };
@@ -37,24 +29,31 @@ function classNamesToEntityConstructors(nymph, selectors) {
                 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'
+                    const QrefEntityClass = qrefOptions.class
                         ? nymph.getEntityClass(qrefOptions.class)
-                        : qrefOptions.class ?? nymph.getEntityClass('Entity');
+                        : nymph.getEntityClass('Entity');
+                    if (enforceRestEnabledFlag && !QrefEntityClass.restEnabled) {
+                        throw new Error('Not accessible.');
+                    }
                     const options = { ...qrefOptions, class: QrefEntityClass };
                     if (!newSelector[key]) {
                         newSelector[key] = [];
                     }
                     newSelector[key].push([
                         name,
-                        [options, ...classNamesToEntityConstructors(nymph, selectors)],
+                        [
+                            options,
+                            ...classNamesToEntityConstructors(nymph, selectors, enforceRestEnabledFlag),
+                        ],
                     ]);
                 }
             }
             else if (key === 'selector' || key === '!selector') {
                 const tmpArr = (Array.isArray(value) ? value : [value]);
-                newSelector[key] = classNamesToEntityConstructors(nymph, tmpArr);
+                newSelector[key] = classNamesToEntityConstructors(nymph, tmpArr, enforceRestEnabledFlag);
             }
             else {
+                // @ts-ignore: ts doesn't know what value is here.
                 newSelector[key] = value;
             }
         }
@@ -62,26 +61,35 @@ function classNamesToEntityConstructors(nymph, selectors) {
     }
     return newSelectors;
 }
-exports.classNamesToEntityConstructors = classNamesToEntityConstructors;
-function entitiesToReferences(item) {
-    if (item instanceof Entity_1.default && typeof item.$toReference === 'function') {
-        return item.$toReference();
+export function entitiesToReferences(item, existingOnly) {
+    if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
+        return item;
+    }
+    else if (item instanceof Entity &&
+        typeof item.$toReference === 'function') {
+        // Convert entities to references.
+        return item.$toReference(existingOnly);
     }
     else if (Array.isArray(item)) {
-        return item.map((entry) => entitiesToReferences(entry));
+        // Recurse into lower arrays.
+        return item.map((entry) => entitiesToReferences(entry, existingOnly));
     }
     else if (item instanceof Object) {
         let newObj = Object.create(item);
         for (let [key, value] of Object.entries(item)) {
-            newObj[key] = entitiesToReferences(value);
+            newObj[key] = entitiesToReferences(value, existingOnly);
         }
         return newObj;
     }
+    // Not an entity or array, just return it.
     return item;
 }
-exports.entitiesToReferences = entitiesToReferences;
-function referencesToEntities(item, nymph, useSkipAc = false) {
-    if (Array.isArray(item)) {
+export function referencesToEntities(item, nymph, useSkipAc = false) {
+    if (item == null || Buffer.isBuffer(item) || ArrayBuffer.isView(item)) {
+        return item;
+    }
+    else if (Array.isArray(item)) {
+        // Check if it's a reference.
         if (item[0] === 'nymph_entity_reference') {
             try {
                 const EntityClass = nymph.getEntityClass(item[2]);
@@ -95,26 +103,29 @@ function referencesToEntities(item, nymph, useSkipAc = false) {
             }
         }
         else {
+            // Recurse into lower arrays.
             return item.map((entry) => referencesToEntities(entry, nymph, useSkipAc));
         }
     }
-    else if (Entity_1.default && item instanceof Object && !(item instanceof Entity_1.default)) {
+    else if (Entity && item instanceof Object && !(item instanceof Entity)) {
         for (let [key, value] of Object.entries(item)) {
             item[key] = referencesToEntities(value, nymph);
         }
     }
+    // Not an array, just return it.
     return item;
 }
-exports.referencesToEntities = referencesToEntities;
-function sortObj(obj) {
+export function sortObj(obj) {
+    // adapted from
+    // http://am.aurlien.net/post/1221493460/sorting-javascript-objects
     const tempArray = Object.keys(obj);
     tempArray.sort();
     for (let i = 0; i < tempArray.length; i++) {
         const temp = obj[tempArray[i]];
         delete obj[tempArray[i]];
+        // @ts-ignore: string can't be used to index type T?? yes, it can.
         obj[tempArray[i]] = temp;
     }
     return obj;
 }
-exports.sortObj = sortObj;
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -1,6 +1,32 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  rootDir: 'src/',
+const jestConfig = {
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  testMatch: [
+    '<rootDir>/src/**/__tests__/**/*.{js,ts,jsx,tsx,mjs,mts}',
+    '<rootDir>/src/**/?(*.)(spec|test).{js,ts,jsx,tsx,mjs,mts}',
+  ],
+  transform: {
+    '^.+\\.(ts|tsx|mts)$': [
+      '@swc/jest',
+      {
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+            tsx: true,
+            decorators: true,
+          },
+          target: 'es2023',
+        },
+        module: {
+          type: 'commonjs',
+        },
+      },
+    ],
+  },
+  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$'],
+  moduleDirectories: ['node_modules', 'src'],
+  moduleNameMapper: {
+    '^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
+  },
 };
+
+export default jestConfig;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nymphjs/nymph",
-  "version": "1.0.0-beta.12",
-  "description": "NymphJS - Nymph ORM",
-  "type": "commonjs",
+  "version": "1.0.0-beta.121",
+  "description": "Nymph.js - Nymph ORM",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
@@ -14,38 +14,48 @@
     "clean": "test -d dist && rm -r dist || true",
     "build": "tsc",
     "watch": "tsc --watch",
-    "prepare": "npm run clean && npm run build",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "prepublish": "npm run clean && npm run build",
+    "typecheck": "npx tsc --noEmit",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
+    "test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests --watch"
   },
   "publishConfig": {
     "access": "public"
   },
+  "homepage": "https://nymph.io",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sciactive/nymphjs.git"
+    "url": "https://forge.sciactive.com/sciactive/nymphjs.git",
+    "directory": "packages/nymph"
   },
-  "author": "Hunter Perrin <hperrin@gmail.com>",
+  "author": "Hunter Perrin <hperrin@port87.com>",
   "bugs": {
-    "url": "https://github.com/sciactive/nymphjs/issues"
+    "url": "https://forge.sciactive.com/sciactive/nymphjs/issues"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/guid": "^1.0.0-beta.12",
-    "joi": "^17.8.3",
-    "locutus": "^2.0.16",
-    "lodash": "^4.17.21",
-    "n-readlines": "^1.0.3"
+    "@nymphjs/guid": "^1.0.0-beta.121",
+    "@sciactive/tokenizer": "^3.4.0",
+    "debug": "^4.4.3",
+    "joi": "^18.2.5",
+    "locutus": "^3.0.36",
+    "lodash-es": "^4.18.1",
+    "n-readlines": "^3.4.1"
   },
   "devDependencies": {
-    "@tsconfig/recommended": "^1.0.2",
-    "@types/jest": "^29.4.0",
-    "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.191",
-    "@types/n-readlines": "^1.0.3",
-    "jest": "^29.4.3",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.5"
+    "@swc/core": "^1.16.1",
+    "@swc/jest": "^0.2.39",
+    "@tsconfig/recommended": "^1.0.13",
+    "@types/debug": "^4.1.13",
+    "@types/jest": "^30.0.0",
+    "@types/locutus": "^0.0.8",
+    "@types/lodash-es": "^4.17.12",
+    "@types/n-readlines": "^1.0.6",
+    "@types/node": "^26.2.0",
+    "cross-env": "^10.1.0",
+    "jest": "^30.4.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^7.0.2"
   },
-  "gitHead": "976040d986831ee0b9a15990adb7e8a48a5379e8"
+  "gitHead": "74e39aff81353d16831656431e97b66ac6effc18"
 }

package/src/Entity.test.ts

@@ -1,10 +1,13 @@
-import { MockNymph } from './testMocks';
+import { jest } from '@jest/globals';
+
+import { cloneDeep } from 'lodash-es';
+
+import { MockNymph } from './testMocks.js';
 import {
   TestBModel as TestBModelClass,
   TestModel as TestModelClass,
   TestModelData,
-} from './testArtifacts';
-import { cloneDeep } from 'lodash';
+} from './testArtifacts.js';
 
 const nymph = new MockNymph();
 
@@ -142,7 +145,7 @@ describe('Entity', () => {
     await testEntity.$refresh();
 
     expect(testEntityCopy.mdate ?? Infinity).toBeLessThanOrEqual(
-      testEntity.mdate ?? 0
+      testEntity.mdate ?? 0,
     );
   });
 
@@ -156,13 +159,25 @@ describe('Entity', () => {
     ]);
   });
 
+  it('toReference works even on an unsaved entity', () => {
+    const unsavedEntity = TestModel.factorySync();
+    const reference = unsavedEntity.$toReference();
+
+    expect(unsavedEntity.guid).toBeNull();
+    expect(reference).toEqual([
+      'nymph_entity_reference',
+      unsavedEntity.$getGuaranteedGUID(),
+      'TestModel',
+    ]);
+  });
+
   it('tags work', async () => {
     expect(testEntity.$hasTag('test')).toEqual(true);
     testEntity.$addTag('test', 'test2');
     expect(testEntity.$hasTag('test', 'test2')).toEqual(true);
     testEntity.$addTag('test', 'test3', 'test4', 'test5', 'test6');
     expect(
-      testEntity.$hasTag('test', 'test3', 'test4', 'test5', 'test6')
+      testEntity.$hasTag('test', 'test3', 'test4', 'test5', 'test6'),
     ).toEqual(true);
     testEntity.$removeTag('test2');
     expect(testEntity.$hasTag('test2')).toEqual(false);
@@ -183,27 +198,34 @@ describe('Entity', () => {
     expect(testEntity.$hasTag('test')).toEqual(true);
   });
 
-  it('references works', async () => {
+  it('references work', async () => {
     await testEntity.$refresh();
 
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await testEntity.refObject?.entity.$wake();
     expect(testEntity.refObject?.entity.guid).toEqual(entityReferenceGuid);
 
     const entity = await TestModel.factory(testEntity.guid as string);
 
+    await entity.reference?.$wake();
     expect(entity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(entity.refArray?.map((e) => e.$wake()) || []);
     expect(entity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await entity.refObject?.entity.$wake();
     expect(entity.refObject?.entity.guid).toEqual(entityReferenceGuid);
   });
 
-  it('sleeping references wake up', () => {
+  it('sleeping references wake up', async () => {
     const entity = TestModel.factoryReference([
       'nymph_entity_reference',
       testEntity.guid as string,
       'TestModel',
     ]) as TestModelClass & TestModelData;
 
+    await entity.$wake();
     expect(entity.guid).toEqual(testEntity.guid);
     expect(entity.cdate).toEqual(testEntity.cdate);
     expect(entity.mdate).toEqual(testEntity.mdate);
@@ -213,8 +235,11 @@ describe('Entity', () => {
     expect(entity.string).toEqual('test');
     expect(entity.array).toEqual(['full', 'of', 'values', 500]);
     expect(entity.number).toEqual(30);
+    await entity.reference?.$wake();
     expect(entity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(entity.refArray?.map((e) => e.$wake()) || []);
     expect(entity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await entity.refObject?.entity.$wake();
     expect(entity.refObject?.entity.guid).toEqual(entityReferenceGuid);
   });
 
@@ -239,6 +264,7 @@ describe('Entity', () => {
         array: ['full', 'of', 'values', 500],
         string: 'test',
         null: null,
+        uniques: [],
       },
       class: 'TestModel',
     });
@@ -288,8 +314,11 @@ describe('Entity', () => {
     expect(testEntity.string).toEqual('good');
     expect(testEntity.array).toEqual(['imanarray']);
     expect(testEntity.number).toEqual(30);
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
+    await testEntity.refObject?.entity.$wake();
     expect(testEntity.refObject?.entity.guid).toEqual(entityReferenceGuid);
 
     expect(await testEntity.$refresh()).toEqual(true);
@@ -311,7 +340,9 @@ describe('Entity', () => {
     expect(testEntity.$hasTag('notag')).toEqual(false);
     expect(testEntity.$hasTag('test')).toEqual(true);
     expect(testEntity.$hasTag('newtag')).toEqual(true);
+    await testEntity.reference?.$wake();
     expect(testEntity.reference?.guid).toEqual(entityReferenceGuid);
+    await Promise.all(testEntity.refArray?.map((e) => e.$wake()) || []);
     expect(testEntity.refArray?.[0].guid).toEqual(entityReferenceGuid);
 
     expect(await testEntity.$refresh()).toEqual(true);
@@ -403,4 +434,16 @@ describe('Entity', () => {
 
     expect(thrown).toEqual(true);
   });
+
+  it('JSON with new entities works', async () => {
+    testEntity.reference = await TestModel.factory();
+
+    // Test that an old JSON payload causes a conflict.
+    const json = JSON.stringify(testEntity);
+    const data = JSON.parse(json);
+
+    testEntity.$jsonAcceptData(data);
+
+    expect(testEntity.reference.guid).toBeNull();
+  });
 });