@nymphjs/client 1.0.0-beta.13 → 1.0.0-beta.131

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

@@ -1,6 +1,7 @@
-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 classNamesToEntityConstructors<T extends any>(nymph: Nymph, item: T): T;
 export declare function entitiesToReferences(item: any): any;
 export declare function referencesToEntities(item: any, nymph: Nymph): any;
 export declare function sortObj<T extends {

package/dist/utils.js

@@ -0,0 +1,145 @@
+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);
+}
+export function entityConstructorsToClassNames(item) {
+    if (item == null) {
+        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(nymph, item) {
+    if (item == null) {
+        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]);
+        return EntityClass;
+    }
+    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));
+    }
+    else if (item instanceof Object) {
+        let newObj = Object.create(item);
+        for (let [key, value] of Object.entries(item)) {
+            newObj[key] = classNamesToEntityConstructors(nymph, value);
+        }
+        return newObj;
+    }
+    // Not an entity or array, just return it.
+    return item;
+}
+export function entitiesToReferences(item) {
+    if (item == null) {
+        return item;
+    }
+    else if (item instanceof Entity) {
+        // Convert entities to references.
+        return item.$toReference();
+    }
+    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));
+    }
+    else if (item instanceof Object) {
+        let newObj = Object.create(item);
+        for (let [key, value] of Object.entries(item)) {
+            newObj[key] = entitiesToReferences(value);
+        }
+        return newObj;
+    }
+    // Not an entity or array, just return it.
+    return 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]);
+                return EntityClass.factoryReference(item);
+            }
+            catch (e) {
+                return item;
+            }
+        }
+        else {
+            // Recurse into lower arrays.
+            return item.map((item) => referencesToEntities(item, nymph));
+        }
+    }
+    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)) {
+            newObj[key] = referencesToEntities(value, nymph);
+        }
+        return newObj;
+    }
+    // Not an array, just return it.
+    return item;
+}
+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]];
+        obj[tempArray[i]] = temp;
+    }
+    return obj;
+}
+//# 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,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: 'es2024',
+        },
+        module: {
+          type: 'commonjs',
+        },
+      },
+    ],
+  },
+  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$'],
+  moduleDirectories: ['node_modules', 'src'],
+  moduleNameMapper: {
+    '^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
+  },
 };
+
+export default jestConfig;

package/package.json

@@ -1,51 +1,55 @@
 {
   "name": "@nymphjs/client",
-  "version": "1.0.0-beta.13",
-  "description": "NymphJS - Client",
-  "browser": "dist/index.js",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "version": "1.0.0-beta.131",
+  "description": "Nymph.js - Client",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "keywords": [
     "nymph",
-    "ORM",
-    "object relational mapper"
+    "nymph.js",
+    "application data framework",
+    "application data and access framework",
+    "browser client",
+    "node client"
   ],
   "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",
+    "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/client"
   },
-  "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": {
+    "fetch-event-source-hperrin": "^3.0.0",
+    "lodash-es": "^4.18.1"
+  },
   "devDependencies": {
-    "@tsconfig/recommended": "^1.0.2",
-    "@types/jest": "^29.4.0",
-    "@types/lodash": "^4.14.191",
-    "jest": "^29.4.3",
-    "lodash": "^4.17.21",
-    "ts-jest": "^29.0.5",
-    "ts-loader": "^9.4.2",
-    "typescript": "^4.9.5",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
+    "@swc/core": "^1.16.1",
+    "@swc/jest": "^0.2.39",
+    "@tsconfig/recommended": "^1.0.13",
+    "@types/jest": "^30.0.0",
+    "@types/lodash-es": "^4.17.12",
+    "cross-env": "^10.1.0",
+    "jest": "^30.4.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^7.0.2"
   },
-  "gitHead": "fcc750b12db6426cbf9dbd38618280c1ba965491"
+  "gitHead": "35a54445bf163d6b9dcead02d89de929fc5f7d26"
 }