@medusajs/link-modules 0.2.12-snapshot-20240904130551 → 0.2.12-snapshot-20240906075935

package/dist/utils/generate-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-schema.d.ts","sourceRoot":"","sources":["../../src/utils/generate-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAI9E,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,wBAAwB,EACjC,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,MAAA;CAAwB,UAiH7C"}
+{"version":3,"file":"generate-schema.d.ts","sourceRoot":"","sources":["../../src/utils/generate-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAS9E,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,wBAAwB,EACjC,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,MAAA;CAAwB,UAmM7C"}

package/dist/utils/generate-schema.js

@@ -20,22 +20,71 @@ function generateGraphQLSchema(joinerConfig, primary, foreign, { logger } = { lo
         if (!extendedModule) {
             throw new Error(`Module ${extend.serviceName} not found. Please verify that the module is configured and installed, also the module must be loaded before the link modules.`);
         }
-        const extJoinerConfig = modules_sdk_1.MedusaModule.getJoinerConfig(extend.relationship.serviceName);
-        let extendedEntityName = extJoinerConfig?.linkableKeys?.[extend.relationship.foreignKey];
-        if (!isReadOnlyLink && !extendedEntityName && (!primary || !foreign)) {
-            logger.warn(`Link modules schema: No linkable key found for ${extend.relationship.foreignKey} on module ${extend.relationship.serviceName}.`);
+        /*    const extJoinerConfig = MedusaModule.getJoinerConfig(
+          extend.relationship.serviceName
+        )*/
+        const extendedEntityName = extendedModule[extend.serviceName].__joinerConfig.linkableKeys[extend.relationship.primaryKey];
+        if (!isReadOnlyLink && (!primary || !foreign || !extendedEntityName)) {
+            logger.warn(`Link modules schema: No linkable key found for ${extend.relationship.primaryKey} on module ${extend.serviceName}.`);
             continue;
         }
         const fieldName = (0, utils_1.camelToSnakeCase)((0, utils_1.lowerCaseFirst)(extend.relationship.alias));
         let type = extend.relationship.isList ? `[${entityName}]` : entityName;
-        if (extJoinerConfig?.isReadOnlyLink) {
-            type = extend.relationship.isList
-                ? `[${extendedEntityName}]`
-                : extendedEntityName;
+        if (joinerConfig?.isReadOnlyLink) {
+            // TODO: In readonly, the relation ship of the extend should be applied on all entities in the module that have the relationshiop foregin key attribute
+            /*type = extend.relationship.isList
+              ? `[${extendedEntityName}]`
+              : extendedEntityName*/
+            continue;
         }
+        /**
+         * Find the field aliases shortcut to extend the entity with it
+         */
+        const fieldsAliasesField = Object.entries(extend.fieldAlias || {})
+            .map(([field, config]) => {
+            const path = (0, utils_1.isString)(config) ? config : config.path;
+            const isList = (0, utils_1.isString)(config)
+                ? extend.relationship.isList
+                : config.isList ?? extend.relationship.isList;
+            const pathSegments = path.split(",").reverse();
+            /*const relationshipMarkerIndex = pathSegments.findIndex((segment) => {
+              return !!joinerConfig.relationships!.find(
+                (relation) => relation.alias === targetEntityAlias
+              )
+            })
+    
+            if (relationshipMarkerIndex === -1) {
+              return
+            }*/
+            /*const relationshipPropertyPath = pathSegments
+              .slice(0, relationshipMarkerIndex + 1)
+              .reverse()*/
+            const targetEntityAlias = path.split(".").pop();
+            const targetEntityRelation = joinerConfig.relationships?.find((relation) => relation.alias === targetEntityAlias);
+            if (!targetEntityRelation) {
+                return;
+            }
+            const targetEntityName = modules_sdk_1.MedusaModule.getJoinerConfig(targetEntityRelation.serviceName).linkableKeys?.[targetEntityRelation.foreignKey];
+            if (!targetEntityName) {
+                logger.warn(`Link modules schema: No linkable key found for ${targetEntityRelation.foreignKey} on module ${targetEntityRelation.serviceName}.`);
+                return;
+            }
+            // TODO: Re visit field aliases that access properties from a type
+            /*const targetEntityType = `${targetEntityName}${
+              relationshipPropertyPath.length
+                ? relationshipPropertyPath.reduce((acc, value) => {
+                    return `${acc}[${value}]`
+                  }, targetEntityName)
+                : ""
+            }`*/
+            return `${field}: ${isList ? `[${targetEntityName}]` : targetEntityName}`;
+        })
+            .filter(Boolean);
         typeDef += `    
-      extend type ${extend.serviceName} {
+      extend type ${extendedEntityName} {
         ${fieldName}: ${type}
+        
+        ${fieldsAliasesField.join("\n")}
       }
     `;
     }
@@ -57,9 +106,16 @@ function generateGraphQLSchema(joinerConfig, primary, foreign, { logger } = { lo
             nullable: !!extraFields[column].nullable,
         };
     }
+    // TODO: temporary, every module might always expose their schema
+    const doesPrimaryExportSchema = !!modules_sdk_1.MedusaModule.getJoinerConfig(primary.serviceName)?.schema;
+    const doesForeignExportSchema = !!modules_sdk_1.MedusaModule.getJoinerConfig(foreign.serviceName)?.schema;
     // Link table relationships
-    const primaryField = `${(0, utils_1.camelToSnakeCase)(primary.alias)}: ${(0, utils_1.toPascalCase)((0, compose_link_name_1.composeTableName)(primary.serviceName))}`;
-    const foreignField = `${(0, utils_1.camelToSnakeCase)(foreign.alias)}: ${(0, utils_1.toPascalCase)((0, compose_link_name_1.composeTableName)(foreign.serviceName))}`;
+    const primaryField = doesPrimaryExportSchema
+        ? `${(0, utils_1.camelToSnakeCase)(primary.alias)}: ${(0, utils_1.toPascalCase)((0, compose_link_name_1.composeTableName)(primary.serviceName))}`
+        : "";
+    const foreignField = doesForeignExportSchema
+        ? `${(0, utils_1.camelToSnakeCase)(foreign.alias)}: ${(0, utils_1.toPascalCase)((0, compose_link_name_1.composeTableName)(foreign.serviceName))}`
+        : "";
     typeDef += `
     type ${entityName} {
       ${Object.entries(fields)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/link-modules",
-  "version": "0.2.12-snapshot-20240904130551",
+  "version": "0.2.12-snapshot-20240906075935",
   "description": "Medusa Default Link Modules Package and Definitions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,10 +29,10 @@
     "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.ts"
   },
   "devDependencies": {
-    "@medusajs/types": "1.12.0-snapshot-20240904130551",
+    "@medusajs/types": "1.12.0-snapshot-20240906075935",
     "cross-env": "^5.2.1",
     "jest": "^29.7.0",
-    "medusa-test-utils": "1.1.45-snapshot-20240904130551",
+    "medusa-test-utils": "1.1.45-snapshot-20240906075935",
     "pg-god": "^1.0.12",
     "rimraf": "^5.0.1",
     "ts-node": "^10.9.1",
@@ -40,8 +40,8 @@
     "typescript": "^5.5.0"
   },
   "dependencies": {
-    "@medusajs/modules-sdk": "1.13.0-snapshot-20240904130551",
-    "@medusajs/utils": "1.12.0-snapshot-20240904130551"
+    "@medusajs/modules-sdk": "1.13.0-snapshot-20240906075935",
+    "@medusajs/utils": "1.12.0-snapshot-20240906075935"
   },
   "peerDependencies": {
     "@mikro-orm/core": "5.9.7",