@postxl/generator 0.22.2 → 0.23.0

package/dist/generators/indices/seed-service.generator.js

@@ -40,15 +40,9 @@ function generateSeedService({ models, meta }) {
      * Note: This is significantly slower - but can be useful for debugging.
      */
     log?: boolean
-    /**
-     * If true, data will be loaded into the repositories after seeding.
-     * This should be used on startup of the application, but typically 
-     * not when running tests or from the CLI.
-     */
-    loadDataAfterSeeding?: boolean
   }
 
-  const DEFAULTOPTIONS: SeedServiceOptions = { reset: false, log: false, loadDataAfterSeeding: false }
+  const DEFAULTOPTIONS: SeedServiceOptions = { reset: false, log: false }
   @Injectable()
   export class SeedService {
     private readonly logger = new Logger(SeedService.name)
@@ -83,7 +77,7 @@ function generateSeedService({ models, meta }) {
       return this._seed({ data: dataParsed.data, options })
     }
   
-    private async _seed({ data, options: { loadDataAfterSeeding, reset, log } }: { data: typeof SEEDDATA; options: SeedServiceOptions }) {
+    private async _seed({ data, options: { reset, log } }: { data: typeof SEEDDATA; options: SeedServiceOptions }) {
       if (reset) {
         this.logger.log('Resetting database')
         await this.dbService.emptyDatabase()
@@ -105,10 +99,6 @@ function generateSeedService({ models, meta }) {
         data: { isSeeded: true },
       })
   
-      if (loadDataAfterSeeding) {
-        await this.dataService.init()
-      }
-  
       this.logger.log('✅ Done')
     }
   

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

@@ -116,6 +116,7 @@ function generateModelBusinessLogic({ model, meta }) {
   `;
     return `
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
+import { FilterOperator } from '@pxl/common'
 
 ${imports.generate()}
 
@@ -140,6 +141,31 @@ export class ${meta.businessLogic.serviceClassName} {
     return this.${modelRepositoryVariableName}.getAll()
   }
 
+    /**
+   * Returns a list of filtered, sorted and paginated ${meta.userFriendlyName}s.
+   */
+  public getList({
+    filter,
+    sort,
+    cursor,
+  }: {
+    filter?: { field: keyof ${model.typeName}; operator: FilterOperator; value: string | number }
+    sort?: { field: keyof ${model.typeName}; ascending: boolean }
+    cursor?: { startRow: number; endRow: number }
+  }) {
+    const items = this.data.getAllAsArray()
+    const filtered = !filter
+      ? items
+      : items.filter((item) => filterFn(item, filter.field, filter.operator, filter.value))
+
+    const filteredAndSorted = !sort
+      ? filtered
+      : filtered.sort((a, b) => (sort.ascending ? compare(a, b, sort.field) : -compare(a, b, sort.field)))
+
+    const paginated = !cursor ? filteredAndSorted : filteredAndSorted.slice(cursor.startRow, cursor.endRow)
+    return { rows: paginated, count: items.length }
+  }
+
   /**
    * Creates a new ${meta.userFriendlyName}.
    */
@@ -164,6 +190,66 @@ export class ${meta.businessLogic.serviceClassName} {
    */
   public async delete(id: ${model.brandedIdType}): Promise<void> {
     return this.${modelRepositoryVariableName}.delete(id)
+  }  
+}
+
+const compare = (a: ${model.typeName}, b: ${model.typeName}, field: keyof ${model.typeName}) => {
+  switch (field) {
+    ${model.fields.filter((f) => f.kind === 'scalar' && f.tsTypeName === 'string').length === 0
+        ? ''
+        : `${model.fields
+            .filter((f) => f.kind === 'scalar' && f.tsTypeName === 'string')
+            .map((f) => `case '${f.name}':`)
+            .join('\n')}
+      return (a[field] || '').localeCompare(b[field] || '')`}
+    default:
+      return 0
+  }
+}
+
+const filterFn = (item: ${model.typeName}, field: keyof ${model.typeName}, operator: FilterOperator, value: string | number): boolean => {
+  switch (field) {
+    ${model.fields.filter((f) => f.kind === 'scalar' && f.tsTypeName === 'string').length === 0
+        ? ''
+        : `${model.fields
+            .filter((f) => f.kind === 'scalar' && f.tsTypeName === 'string')
+            .map((f) => `case '${f.name}':`)
+            .join('\n')}
+            {
+              if (typeof value !== 'string') return false
+              switch (operator) {
+                case 'contains': {
+                  return (item[field] || '').toLowerCase().includes(value.toLowerCase())
+                }
+                default:
+                  return false
+              }
+            }`}
+    ${model.fields.filter((f) => f.kind === 'scalar' && f.tsTypeName === 'number').length === 0
+        ? ''
+        : `${model.fields
+            .filter((f) => f.kind === 'scalar' && f.tsTypeName === 'number')
+            .map((f) => `case '${f.name}':`)
+            .join('\n')}
+            {
+              const toCompare = item[field]
+              if (typeof value !== 'number' || toCompare === null) return false
+              switch (operator) {
+                case 'eq': {
+                  return item[field] === value
+                }
+                case 'gt': {
+                  return toCompare > value
+                }
+                case 'lt': {
+                  return toCompare < value
+                }
+                default:
+                  return false
+              }
+            }`}
+    default:
+      return false
   }
 }
 `;

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

@@ -144,7 +144,7 @@ export class ${meta.data.repositoryClassName} implements Repository<
     ${model.defaultField
         ? `
       // We re-initialize the default value to undefined so the check for exactly one item does not fail upon re-initialization
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-non-null-assertion
       this.defaultValue = undefined!
     `
         : ''}

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

@@ -17,7 +17,7 @@ function generateRoute({ model, meta }) {
     const updateMethod = getUpdateMethod({ model, meta });
     const deleteMethod = getDeleteMethod({ idField, meta });
     const imports = imports_1.ImportsGenerator.from(meta.trpc.routerFilePath).addImport({
-        items: [meta.types.toBrandedIdTypeFnName],
+        items: [model.typeName, meta.types.toBrandedIdTypeFnName],
         from: meta.types.importPath,
     });
     for (const relation of (0, fields_1.getRelationFields)(model)) {
@@ -31,6 +31,7 @@ function generateRoute({ model, meta }) {
 import { z } from 'zod'
 import { procedure, router } from '../trpc'
 
+import { CURSOR_DECODER, FILTER_OPERATOR_DECODER } from '@pxl/common'
 ${imports.generate()}
 
 export const ${meta.trpc.routerName} = router({
@@ -40,6 +41,30 @@ export const ${meta.trpc.routerName} = router({
     .input(z.${idField.unbrandedTypeName}().transform(${meta.types.toBrandedIdTypeFnName}))
     .query(({ input, ctx }) => ctx.data.${meta.data.dataServiceName}.get(input)),
   getMap: procedure.query(({ ctx }) => ctx.data.${meta.data.dataServiceName}.getAll()),
+  getList: procedure
+    .input(z.object({
+      cursor: CURSOR_DECODER,
+      sort: z.object({
+        field: z.enum([
+          ${model.fields.map((f) => `'${f.name}'`).join(',\n')}
+        ])
+        .transform((v): keyof ${model.typeName} => v),
+        ascending: z.boolean(),
+      })
+      .optional(),
+      filter: z.object({
+        field: z.enum([
+          ${model.fields.map((f) => `'${f.name}'`).join(',\n')}
+        ])
+        .transform((v): keyof ${model.typeName} => v),
+        operator: FILTER_OPERATOR_DECODER,
+        value: z.union([z.string(), z.number()]),
+      })
+      .optional(),
+    }))
+    .query(({ input, ctx }) => {
+      return ctx.data.${meta.data.dataServiceName}.getList(input)
+    }),
 
   ${omit(createMethod, model.attributes.skipCreate)}
   ${omit(updateMethod, model.attributes.skipUpdate)}

package/package.json

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