@nymphjs/client 1.0.0-beta.9 → 1.0.0-beta.91

package/{lib → dist}/utils.d.ts

@@ -1,4 +1,4 @@
-import Nymph from './Nymph';
+import Nymph from './Nymph.js';
 export declare function uniqueStrings(array: string[]): string[];
 export declare function entityConstructorsToClassNames(item: any): any;
 export declare function entitiesToReferences(item: any): any;

package/{lib → dist}/utils.js

@@ -1,25 +1,20 @@
-"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.entityConstructorsToClassNames = exports.uniqueStrings = void 0;
-const Entity_1 = __importDefault(require("./Entity"));
-function uniqueStrings(array) {
+import Entity from './Entity.js';
+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 entityConstructorsToClassNames(item) {
+export function entityConstructorsToClassNames(item) {
     if (typeof item === 'function' &&
-        item.prototype instanceof Entity_1.default &&
+        item.prototype instanceof Entity &&
         typeof item.class === 'string') {
+        // Convert entity classes to strings.
         return item.class;
     }
     else if (Array.isArray(item)) {
+        // Recurse into lower arrays.
         return item.map((entry) => entityConstructorsToClassNames(entry));
     }
     else if (item instanceof Object) {
@@ -29,14 +24,20 @@ function entityConstructorsToClassNames(item) {
         }
         return newObj;
     }
+    // Not an entity or array, just return it.
     return item;
 }
-exports.entityConstructorsToClassNames = entityConstructorsToClassNames;
-function entitiesToReferences(item) {
-    if (item instanceof Entity_1.default && typeof item.$toReference === 'function') {
+export function entitiesToReferences(item) {
+    if (item == null) {
+        return item;
+    }
+    else if (item instanceof Entity &&
+        typeof item.$toReference === 'function') {
+        // Convert entities to references.
         return item.$toReference();
     }
     else if (Array.isArray(item)) {
+        // Recurse into lower arrays.
         return item.map((entry) => entitiesToReferences(entry));
     }
     else if (item instanceof Object) {
@@ -46,11 +47,15 @@ function entitiesToReferences(item) {
         }
         return newObj;
     }
+    // Not an entity or array, just return it.
     return item;
 }
-exports.entitiesToReferences = entitiesToReferences;
-function referencesToEntities(item, nymph) {
-    if (Array.isArray(item)) {
+export function referencesToEntities(item, nymph) {
+    if (item == null) {
+        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]);
@@ -61,18 +66,21 @@ function referencesToEntities(item, nymph) {
             }
         }
         else {
+            // Recurse into lower arrays.
             return item.map((item) => referencesToEntities(item, nymph));
         }
     }
-    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++) {
@@ -82,5 +90,4 @@ function sortObj(obj) {
     }
     return obj;
 }
-exports.sortObj = sortObj;
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

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

package/jest.config.js

@@ -1,6 +1,15 @@
+import { createDefaultEsmPreset } from 'ts-jest';
+
+const presetConfig = createDefaultEsmPreset();
+
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
+const jestConfig = {
+  ...presetConfig,
   testEnvironment: 'node',
   rootDir: 'src/',
+  moduleNameMapper: {
+    '^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
+  },
 };
+
+export default jestConfig;

package/package.json

@@ -1,27 +1,22 @@
 {
   "name": "@nymphjs/client",
-  "version": "1.0.0-beta.9",
-  "description": "NymphJS - Client",
-  "browser": "dist/index.js",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "version": "1.0.0-beta.91",
+  "description": "Nymph.js - Client",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [
     "nymph",
     "ORM",
     "object relational mapper"
   ],
   "scripts": {
-    "clean": "npm run clean:ts && npm run clean:js",
-    "clean:ts": "test -d lib && rm -r lib || true",
-    "clean:js": "test -d dist && rm -r dist || true",
-    "build": "npm run build:ts && npm run build:js",
-    "build:ts": "tsc",
-    "build:js": "webpack",
-    "watch:ts": "tsc --watch",
-    "watch:js": "webpack --watch",
-    "prepare": "npm run clean && npm run build",
-    "test": "jest --detectOpenHandles",
-    "test:watch": "jest --watch"
+    "clean": "test -d dist && rm -r dist || true",
+    "build": "tsc",
+    "watch": "tsc --watch",
+    "prepublish": "npm run clean && npm run build",
+    "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
+    "test:watch": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest --watch"
   },
   "publishConfig": {
     "access": "public"
@@ -35,17 +30,18 @@
     "url": "https://github.com/sciactive/nymphjs/issues"
   },
   "license": "Apache-2.0",
+  "dependencies": {
+    "fetch-event-source-hperrin": "^3.0.0",
+    "lodash-es": "^4.17.21"
+  },
   "devDependencies": {
-    "@tsconfig/recommended": "^1.0.1",
-    "@types/jest": "^29.2.5",
-    "@types/lodash": "^4.14.191",
-    "jest": "^29.3.1",
-    "lodash": "^4.17.21",
-    "ts-jest": "^29.0.3",
-    "ts-loader": "^9.4.2",
-    "typescript": "^4.9.4",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
+    "@tsconfig/recommended": "^1.0.8",
+    "@types/jest": "^29.5.14",
+    "@types/lodash-es": "^4.17.12",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.7.2"
   },
-  "gitHead": "dd7ad255610e1028dc232c818b1af0b627847764"
+  "gitHead": "45074e1da0e7879625382a3d35134cde45793f24"
 }