@simtlix/simfinity-js 1.7.0 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simtlix/simfinity-js",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "",
   "main": "src/index.js",
   "type": "module",

package/src/index.js

@@ -1537,6 +1537,26 @@ we will allow users to use when they are making request. */
 export const createSchema = (includedQueryTypes,
   includedMutationTypes, includedCustomMutations) => {
   
+  // Generate models for all registered types now that all types are available
+  Object.values(typesDict.types).forEach(typeInfo => {
+    if (typeInfo.gqltype && !typeInfo.model) {
+      if (typeInfo.endpoint) {
+        // Generate model with collection for endpoint types (types registered with connect)
+        typeInfo.model = generateModel(typeInfo.gqltype, typeInfo.onModelCreated);
+      } else if (typeInfo.needsModel) {
+        // Generate model without collection for no-endpoint types that need models (addNoEndpointType)
+        typeInfo.model = generateModelWithoutCollection(typeInfo.gqltype, null);
+      }
+    }
+  });
+
+  // Also update the typesDictForUpdate with the generated models
+  Object.keys(typesDict.types).forEach(typeName => {
+    if (typesDictForUpdate.types[typeName]) {
+      typesDictForUpdate.types[typeName].model = typesDict.types[typeName].model;
+    }
+  });
+
   // Auto-generate resolvers for all registered types now that all types are available
   Object.values(typesDict.types).forEach(typeInfo => {
     if (typeInfo.gqltype) {
@@ -1628,13 +1648,14 @@ export const connect = (model, gqltype, simpleEntityEndpointName,
     gqltype,
   };
   typesDict.types[gqltype.name] = {
-    model: model || generateModel(gqltype, onModelCreated),
+    model: model, // Will be generated later in createSchema if not provided
     gqltype,
     simpleEntityEndpointName,
     listEntitiesEndpointName,
     endpoint: true,
     controller,
     stateMachine,
+    onModelCreated, // Store the callback for later use
   };
 
   typesDictForUpdate.types[gqltype.name] = { ...typesDict.types[gqltype.name] };
@@ -1661,8 +1682,9 @@ export const addNoEndpointType = (gqltype) => {
   typesDict.types[gqltype.name] = {
     gqltype,
     endpoint: false,
-    // Generate model if needed for relationships, but don't create collection
-    model: needsModel ? generateModelWithoutCollection(gqltype, null) : null,
+    // Model will be generated later in createSchema if needed
+    model: null,
+    needsModel, // Store whether this type needs a model
   };
 
   typesDictForUpdate.types[gqltype.name] = { ...typesDict.types[gqltype.name] };

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

@@ -28,6 +28,7 @@ describe('preventCreatingCollection option', () => {
     });
 
     simfinity.connect(null, TestType, 'testTypeDefault', 'testTypesDefault');
+    simfinity.createSchema(); // Models are now generated during schema creation
     expect(createCollectionSpy).toHaveBeenCalledTimes(1);
   });
 
@@ -43,6 +44,7 @@ describe('preventCreatingCollection option', () => {
     });
 
     simfinity.connect(null, TestType, 'testTypePrevent', 'testTypesPrevent');
+    simfinity.createSchema(); // Models are now generated during schema creation
     expect(createCollectionSpy).not.toHaveBeenCalled();
   });
 
@@ -59,6 +61,7 @@ describe('preventCreatingCollection option', () => {
     });
 
     simfinity.connect(null, TestType, 'testTypeAllow', 'testTypesAllow');
+    simfinity.createSchema(); // Models are now generated during schema creation
     expect(createCollectionSpy).toHaveBeenCalledTimes(1);
   });
 });

package/tests/validated-scalar.test.js

@@ -117,6 +117,7 @@ describe('Custom Validated Scalar Types', () => {
 
     beforeAll(() => {
       simfinity.connect(null, UserType, 'user', 'users');
+      simfinity.createSchema(); // Models are now generated during schema creation
       UserModel = simfinity.getModel(UserType);
     });
 
@@ -150,6 +151,7 @@ describe('Custom Validated Scalar Types', () => {
         }),
       });
       simfinity.connect(null, UserWithUniqueType, 'userWithUnique', 'usersWithUnique');
+      simfinity.createSchema(); // Models are now generated during schema creation
       const UserWithUniqueModel = simfinity.getModel(UserWithUniqueType);
       const schema = UserWithUniqueModel.schema.obj;