@simtlix/simfinity-js 1.4.0 → 1.6.0

package/eslint.config.mjs

@@ -16,48 +16,56 @@ export default [
     {
         ignores: ["node_modules/*", "data/*", "eslint.config.mjs"],
     },
-    ...compat.extends("airbnb-base"),
+    js.configs.recommended,
     {
         files: ["**/*.js"],
         languageOptions: {
             globals: {
-                ...globals.commonjs,
                 ...globals.node,
-                ...globals.jest,
+                ...globals.es2024,
             },
-
             ecmaVersion: 2024,
-            sourceType: "commonjs",
+            sourceType: "module",
         },
-
         rules: {
-            "default-case": "off",
-            "max-len": 0,
-            "no-console": "off",
-            "no-underscore-dangle": "off",
+            // Code style and best practices (relaxed to match existing code)
+            "quotes": ["error", "single"],
+            "semi": ["error", "always"],
+            "comma-dangle": ["error", "always-multiline"],
+            "object-curly-spacing": ["error", "always"],
+            "array-bracket-spacing": ["error", "never"],
+            
+            // ES6+ features
+            "prefer-const": "error",
+            "no-var": "error",
+            "prefer-arrow-callback": "off", // Allow function declarations
+            "arrow-spacing": "error",
+            
+            // Best practices
+            "no-console": "off", // Allow console for this project
+            "no-underscore-dangle": "off", // Allow underscore dangle for MongoDB _id
             "no-await-in-loop": "off",
-
-            "no-param-reassign": ["error", {
-                props: false,
-            }],
-
+            "max-len": "off", // Disable max-len for now
+            "indent": "off", // Disable indent for now to match existing style
+            
+            // Parameter reassignment (common in GraphQL resolvers)
+            "no-param-reassign": ["error", { "props": false }],
+            
+            // Function formatting
             "function-paren-newline": "off",
             "function-call-argument-newline": "off",
-
+            
+            // Restricted syntax
             "no-restricted-syntax": ["error", {
                 selector: "ForInStatement",
                 message: "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.",
             }, {
-                selector: "LabeledStatement",
+                selector: "LabeledStatement", 
                 message: "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.",
             }, {
                 selector: "WithStatement",
                 message: "`with` is disallowed in strict mode because it makes code impossible to predict and optimize.",
             }],
-
-            "import/no-unresolved": ["error", {
-                ignore: ["graphql", "mongoose"],
-            }],
         },
     },
 ];

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@simtlix/simfinity-js",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "",
   "main": "src/index.js",
+  "type": "module",
   "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest --coverage",
     "lint": "eslint '**/*.js'",
     "lint-fix": "eslint --fix '**/*.js'"
   },
@@ -24,34 +25,16 @@
     "mongoose": "^8.16.2"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.0",
-    "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.30.1",
     "eslint": "^9.30.1",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.32.0",
-    "ghooks": "^2.0.4",
     "globals": "^16.3.0",
-    "jest": "^30.0.4"
+    "vitest": "^3.2.4"
   },
   "config": {
-    "ghooks": {
-      "pre-commit": "npm run lint || npm run lint-fix"
-    },
     "owner": "simtlix"
   },
   "optionalDependencies": {
     "graphql": "^16.11.0",
     "mongoose": "^8.16.2"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "testMatch": [
-      "**/tests/**/*.test.js"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.js",
-      "!src/index.js"
-    ]
   }
 }

package/src/const/QLOperator.js

@@ -1,6 +1,4 @@
-const graphql = require('graphql');
-
-const { GraphQLEnumType } = graphql;
+import { GraphQLEnumType } from 'graphql';
 
 const QLOperator = new GraphQLEnumType({
   name: 'QLOperator',
@@ -38,4 +36,4 @@ const QLOperator = new GraphQLEnumType({
   },
 });
 
-module.exports = QLOperator;
+export default QLOperator;

package/src/const/QLSort.js

@@ -1,11 +1,9 @@
-const graphql = require('graphql');
-
-const {
+import {
   GraphQLInputObjectType,
   GraphQLNonNull,
   GraphQLEnumType,
   GraphQLString,
-} = graphql;
+} from 'graphql';
 
 const QLSortOrder = new GraphQLEnumType({
   name: 'QLSortOrder',
@@ -27,4 +25,4 @@ const QLSort = new GraphQLInputObjectType({
   }),
 });
 
-module.exports = QLSort;
+export default QLSort;

package/src/const/QLValue.js

@@ -1,6 +1,4 @@
-const graphql = require('graphql');
-
-const { GraphQLScalarType, Kind } = graphql;
+import { GraphQLScalarType, Kind } from 'graphql';
 
 function parseQLValue(value) {
   return value;
@@ -38,4 +36,4 @@ const QLValue = new GraphQLScalarType({
   },
 });
 
-module.exports = QLValue;
+export default QLValue;

package/src/errors/internal-server.error.js

@@ -1,4 +1,4 @@
-const SimfinityError = require('./simfinity.error');
+import SimfinityError from './simfinity.error.js';
 
 class InternalServerError extends SimfinityError {
   constructor(message, cause) {
@@ -8,4 +8,4 @@ class InternalServerError extends SimfinityError {
   }
 }
 
-module.exports = InternalServerError;
+export default InternalServerError;

package/src/errors/simfinity.error.js

@@ -12,4 +12,4 @@ class SimfinityError extends Error {
   }
 }
 
-module.exports = SimfinityError;
+export default SimfinityError;

package/src/index.js

@@ -1,19 +1,17 @@
-const graphql = require('graphql');
-const mongoose = require('mongoose');
-
-const SimfinityError = require('./errors/simfinity.error');
-const InternalServerError = require('./errors/internal-server.error');
-const QLOperator = require('./const/QLOperator');
-const QLValue = require('./const/QLValue');
-const QLSort = require('./const/QLSort');
-
-mongoose.set('strictQuery', false);
-
-const {
+import {
   GraphQLObjectType, GraphQLString, GraphQLID, GraphQLSchema, GraphQLList,
   GraphQLNonNull, GraphQLInputObjectType, GraphQLScalarType, __Field,
   GraphQLInt, GraphQLEnumType, GraphQLBoolean, GraphQLFloat, Kind,
-} = graphql;
+} from 'graphql';
+import mongoose from 'mongoose';
+
+import SimfinityError from './errors/simfinity.error.js';
+import InternalServerError from './errors/internal-server.error.js';
+import QLOperator from './const/QLOperator.js';
+import QLValue from './const/QLValue.js';
+import QLSort from './const/QLSort.js';
+
+mongoose.set('strictQuery', false);
 
 // Adding 'extensions' field into instronspection query
 const RelationType = new GraphQLObjectType({
@@ -83,19 +81,19 @@ const buildErrorFormatter = (callback) => {
 
 const middlewares = [];
 
-module.exports.use = (middleware) => {
+export const use = (middleware) => {
   middlewares.push(middleware);
 };
 
-module.exports.buildErrorFormatter = buildErrorFormatter;
+export { buildErrorFormatter };
 
-module.exports.SimfinityError = SimfinityError;
+export { SimfinityError };
 
-module.exports.InternalServerError = InternalServerError;
+export { InternalServerError };
 
 let preventCollectionCreation = false;
 
-module.exports.preventCreatingCollection = (prevent) => {
+export const preventCreatingCollection = (prevent) => {
   preventCollectionCreation = !!prevent;
 };
 
@@ -416,7 +414,7 @@ const buildInputType = (gqltype) => {
 
 const getInputType = (type) => typesDict.types[type.name].inputType;
 
-module.exports.getInputType = getInputType;
+export { getInputType };
 
 const buildPendingInputTypes = (waitingForInputType) => {
   const stillWaitingInputType = {};
@@ -549,17 +547,17 @@ const iterateonCollectionFields = async (materializedModel, gqltype, objectId, s
   for (const [collectionFieldKey, collectionField] of
     Object.entries(materializedModel.collectionFields)) {
     if (collectionField.added) {
-      // eslint-disable-next-line no-use-before-define
+       
       await executeItemFunction(gqltype, collectionFieldKey, objectId, session,
         collectionField.added, operations.SAVE);
     }
     if (collectionField.updated) {
-      // eslint-disable-next-line no-use-before-define
+       
       await executeItemFunction(gqltype, collectionFieldKey, objectId, session,
         collectionField.updated, operations.UPDATE);
     }
     if (collectionField.deleted) {
-      // eslint-disable-next-line no-use-before-define
+       
       await executeItemFunction(gqltype, collectionFieldKey, objectId, session,
         collectionField.deleted, operations.DELETE);
     }
@@ -681,7 +679,7 @@ const onSaveObject = async (Model, gqltype, controller, args, session, linkToPar
   return result;
 };
 
-module.exports.saveObject = async (typeName, args, session) => {
+export const saveObject = async (typeName, args, session) => {
   const type = typesDict.types[typeName];
   return onSaveObject(type.model, type.gqltype, type.controller, args, session);
 };
@@ -1389,9 +1387,9 @@ const buildQuery = async (input, gqltype, isCount) => {
 
         if (sort.field.indexOf('.') >= 0) {
           const sortParts = sort.field.split('.');
-          // eslint-disable-next-line prefer-destructuring
+           
           fixedSortField = sortParts[0];
-          // eslint-disable-next-line no-plusplus
+           
           for (let i = 1; i < sortParts.length - 1; i++) {
             fixedSortField += `_${sortParts[i]}`;
           }
@@ -1536,15 +1534,15 @@ const buildRootQuery = (name, includedTypes) => {
 
 /* Creating a new GraphQL Schema, with options query which defines query
 we will allow users to use when they are making request. */
-module.exports.createSchema = (includedQueryTypes,
+export const createSchema = (includedQueryTypes,
   includedMutationTypes, includedCustomMutations) => new GraphQLSchema({
   query: buildRootQuery('RootQueryType', includedQueryTypes),
   mutation: buildMutation('Mutation', includedMutationTypes, includedCustomMutations),
 });
 
-module.exports.getModel = (gqltype) => typesDict.types[gqltype.name].model;
+export const getModel = (gqltype) => typesDict.types[gqltype.name].model;
 
-module.exports.registerMutation = (name, description, inputModel, outputModel, callback) => {
+export const registerMutation = (name, description, inputModel, outputModel, callback) => {
   registeredMutations[name] = {
     description,
     inputModel,
@@ -1563,43 +1561,46 @@ const autoGenerateResolvers = (gqltype) => {
       if (fieldEntry.extensions && fieldEntry.extensions.relation) {
         const { relation } = fieldEntry.extensions;
 
-        if (fieldEntry.type instanceof GraphQLList) {
-          // Collection field - generate resolve for one-to-many relationship
-          const relatedType = fieldEntry.type.ofType;
-          const connectionField = relation.connectionField || fieldName;
-
-          fieldEntry.resolve = (parent) => {
-            // Lazy lookup of the related model
-            const relatedTypeInfo = typesDict.types[relatedType.name];
-            if (!relatedTypeInfo || !relatedTypeInfo.model) {
-              throw new Error(`Related type ${relatedType.name} not found or not connected. Make sure it's connected with simfinity.connect() or simfinity.addNoEndpointType().`);
-            }
-            const query = {};
-            query[connectionField] = parent.id || parent._id;
-            return relatedTypeInfo.model.find(query);
-          };
-        } else if (fieldEntry.type instanceof GraphQLObjectType
-                   || (fieldEntry.type instanceof GraphQLNonNull && fieldEntry.type.ofType instanceof GraphQLObjectType)) {
-          // Single object field - generate resolve for one-to-one relationship
-          const relatedType = fieldEntry.type instanceof GraphQLNonNull ? fieldEntry.type.ofType : fieldEntry.type;
-          const connectionField = relation.connectionField || fieldName;
-
-          fieldEntry.resolve = (parent) => {
-            // Lazy lookup of the related model
-            const relatedTypeInfo = typesDict.types[relatedType.name];
-            if (!relatedTypeInfo || !relatedTypeInfo.model) {
-              throw new Error(`Related type ${relatedType.name} not found or not connected. Make sure it's connected with simfinity.connect() or simfinity.addNoEndpointType().`);
-            }
-            const relatedId = parent[connectionField] || parent[fieldName];
-            return relatedId ? relatedTypeInfo.model.findById(relatedId) : null;
-          };
+        // Only generate resolvers for non-embedded relationships
+        if (!relation.embedded) {
+          if (fieldEntry.type instanceof GraphQLList) {
+            // Collection field - generate resolve for one-to-many relationship
+            const relatedType = fieldEntry.type.ofType;
+            const connectionField = relation.connectionField || fieldName;
+
+            fieldEntry.resolve = (parent) => {
+              // Lazy lookup of the related model
+              const relatedTypeInfo = typesDict.types[relatedType.name];
+              if (!relatedTypeInfo || !relatedTypeInfo.model) {
+                throw new Error(`Related type ${relatedType.name} not found or not connected. Make sure it's connected with simfinity.connect() or simfinity.addNoEndpointType().`);
+              }
+              const query = {};
+              query[connectionField] = parent.id || parent._id;
+              return relatedTypeInfo.model.find(query);
+            };
+          } else if (fieldEntry.type instanceof GraphQLObjectType
+                     || (fieldEntry.type instanceof GraphQLNonNull && fieldEntry.type.ofType instanceof GraphQLObjectType)) {
+            // Single object field - generate resolve for one-to-one relationship
+            const relatedType = fieldEntry.type instanceof GraphQLNonNull ? fieldEntry.type.ofType : fieldEntry.type;
+            const connectionField = relation.connectionField || fieldName;
+
+            fieldEntry.resolve = (parent) => {
+              // Lazy lookup of the related model
+              const relatedTypeInfo = typesDict.types[relatedType.name];
+              if (!relatedTypeInfo || !relatedTypeInfo.model) {
+                throw new Error(`Related type ${relatedType.name} not found or not connected. Make sure it's connected with simfinity.connect() or simfinity.addNoEndpointType().`);
+              }
+              const relatedId = parent[connectionField] || parent[fieldName];
+              return relatedId ? relatedTypeInfo.model.findById(relatedId) : null;
+            };
+          }
         }
       }
     }
   }
 };
 
-module.exports.connect = (model, gqltype, simpleEntityEndpointName,
+export const connect = (model, gqltype, simpleEntityEndpointName,
   listEntitiesEndpointName, controller, onModelCreated, stateMachine) => {
   waitingInputType[gqltype.name] = {
     model,
@@ -1621,7 +1622,7 @@ module.exports.connect = (model, gqltype, simpleEntityEndpointName,
   autoGenerateResolvers(gqltype);
 };
 
-module.exports.addNoEndpointType = (gqltype) => {
+export const addNoEndpointType = (gqltype) => {
   waitingInputType[gqltype.name] = {
     gqltype,
   };
@@ -1652,4 +1653,4 @@ module.exports.addNoEndpointType = (gqltype) => {
   autoGenerateResolvers(gqltype);
 };
 
-module.exports.createValidatedScalar = createValidatedScalar;
+export { createValidatedScalar };

package/tests/prevent-collection-creation.test.js

@@ -1,15 +1,16 @@
-const mongoose = require('mongoose');
-const { GraphQLObjectType, GraphQLString, GraphQLID } = require('graphql');
-const simfinity = require('../src/index');
+import {
+  describe, test, expect, beforeEach, afterEach, vi,
+} from 'vitest';
+import mongoose from 'mongoose';
+import { GraphQLObjectType, GraphQLString, GraphQLID } from 'graphql';
+import * as simfinity from '../src/index.js';
 
 describe('preventCreatingCollection option', () => {
   let createCollectionSpy;
 
   beforeEach(() => {
-    // Reset modules to have a clean state for each test
-    jest.resetModules();
     // Spy on the createCollection method of the mongoose model prototype
-    createCollectionSpy = jest.spyOn(mongoose.Model, 'createCollection').mockImplementation(() => Promise.resolve());
+    createCollectionSpy = vi.spyOn(mongoose.Model, 'createCollection').mockImplementation(() => Promise.resolve());
   });
 
   afterEach(() => {

package/tests/validated-scalar.test.js

@@ -1,8 +1,11 @@
-const {
+import {
+  describe, test, expect, beforeAll,
+} from 'vitest';
+import {
   GraphQLObjectType, GraphQLString, GraphQLInt, GraphQLID, GraphQLList, GraphQLNonNull,
-} = require('graphql');
-const { createValidatedScalar } = require('../src/index');
-const simfinity = require('../src/index');
+} from 'graphql';
+import { createValidatedScalar } from '../src/index.js';
+import * as simfinity from '../src/index.js';
 
 describe('Custom Validated Scalar Types', () => {
   let EmailScalar;