@postxl/generator 0.9.0 → 0.9.2

package/dist/generators/models/repository.generator.js

@@ -64,7 +64,7 @@ export class ${meta.data.repositoryClassName} implements Repository<
 
   ${relations
         .map((r) => `
-    protected ${r.name}Map: Map<${r.meta.types.brandedIdType}, Set<${model.brandedIdType}>> = new Map()
+    protected ${r.name}Map: Map<${r.meta.types.brandedIdType}, Map<${model.brandedIdType}, ${model.typeName}>> = new Map()
   `)
         .join('\n')}
   
@@ -99,7 +99,7 @@ export class ${meta.data.repositoryClassName} implements Repository<
 
     for (const rawItem of data) {
       const item = this.${decoder}(rawItem)
-      this.data.set(item.id, item)
+      this.set(item)
 
       ${model.defaultField ? defaultValueInitFn : ''}
       ${uniqueStringFields.map((f) => `this.uniqueIds.${f.name}.set(item.${f.name}, item)`).join('\n')}
@@ -325,8 +325,10 @@ export class ${meta.data.repositoryClassName} implements Repository<
     /** 
      * Function to retrieve all ${(0, string_1.pluralize)(model.name)} that are related to a ${r.name}
      */
-    public ${r.fieldMeta.getByForeignKeyMethodFnName}(id: ${r.meta.types.brandedIdType}): ${model.typeName}[] {
-      return this.${r.fieldMeta.getByForeignKeyIdsMethodFnName}(id).map((id) => this.get(id) as ${model.typeName})
+    public ${r.fieldMeta.getByForeignKeyMethodFnName}(id: ${r.meta.types.brandedIdType}): Map<${model.brandedIdType},${model.typeName}> {
+      const result = this.${r.name}Map.get(id)
+      if (!result) return new Map()
+      return result
     }
 
     /** 
@@ -335,7 +337,7 @@ export class ${meta.data.repositoryClassName} implements Repository<
     public ${r.fieldMeta.getByForeignKeyIdsMethodFnName}(id: ${r.meta.types.brandedIdType}): ${model.brandedIdType}[] {
       const s = this.${r.name}Map.get(id)
       if (!s) return []
-      return Array.from(s)
+      return Array.from(s.keys())
     }
   `)
         .join('\n')}
@@ -387,12 +389,12 @@ export class ${meta.data.repositoryClassName} implements Repository<
       ${relations
         .map((r) => `
         ${!r.isRequired ? `if (item.${r.name}) {` : ''}
-        let ${r.name}Set = this.${r.name}Map.get(item.${r.name})
-        if (!${r.name}Set) {
-          ${r.name}Set = new Set()
-          this.${r.name}Map.set(item.${r.name}, ${r.name}Set)
+        let ${r.name}Map = this.${r.name}Map.get(item.${r.name})
+        if (!${r.name}Map) {
+          ${r.name}Map = new Map()
+          this.${r.name}Map.set(item.${r.name}, ${r.name}Map)
         }
-        ${r.name}Set.add(item.id)
+        ${r.name}Map.set(item.id, item)
         ${!r.isRequired ? `}` : ''}
       `)
         .join('\n')}
@@ -408,10 +410,10 @@ export class ${meta.data.repositoryClassName} implements Repository<
       ${relations
         .map((r) => `
         ${!r.isRequired ? `if (item.${r.name}) {` : ''}
-        const ${r.name}Set = this.${r.name}Map.get(item.${r.name})
-        if (${r.name}Set) {
-          ${r.name}Set.delete(item.id)
-          if (${r.name}Set.size === 0) {
+        const ${r.name}Map = this.${r.name}Map.get(item.${r.name})
+        if (${r.name}Map) {
+          ${r.name}Map.delete(item.id)
+          if (${r.name}Map.size === 0) {
             this.${r.name}Map.delete(item.${r.name})
           }
         }

package/dist/lib/meta.js

@@ -156,8 +156,8 @@ function getFieldMetadata({ field }) {
     const PascalCase = (0, string_1.toPascalCase)(field.name);
     return {
         tsFieldName: Types.toVariableName((0, string_1.toCamelCase)(field.name)),
-        getByForeignKeyMethodFnName: Types.toFunction(`get${PascalCase}Items`),
-        getByForeignKeyIdsMethodFnName: Types.toFunction(`get${PascalCase}Ids`),
+        getByForeignKeyMethodFnName: Types.toFunction(`getItemsFor${PascalCase}`),
+        getByForeignKeyIdsMethodFnName: Types.toFunction(`getIdsFor${PascalCase}`),
     };
     // switch (field.kind) {
     //   case 'id':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {