create-forgeon 0.3.22 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "description": "Forgeon project generator CLI",
   "license": "MIT",
   "author": "Forgeon",

package/src/modules/executor.test.mjs

@@ -506,6 +506,16 @@ function assertFilesAccessWiring(projectRoot) {
   assert.match(filesController, /@Req\(\) req: any/);
   assert.match(filesController, /openDownload\(publicId,\s*variant\)/);
 
+  const filesModule = fs.readFileSync(
+    path.join(projectRoot, 'packages', 'files', 'src', 'forgeon-files.module.ts'),
+    'utf8',
+  );
+  assert.match(filesModule, /import \{ ForgeonFilesAccessModule \} from '@forgeon\/files-access';/);
+  assert.match(
+    filesModule,
+    /imports: \[FilesConfigModule, ForgeonFilesAccessModule, (?:ForgeonFilesImageModule, )?DbPrismaModule, \.\.\.\(options\.imports \?\? \[\]\)\],/,
+  );
+
   const healthController = fs.readFileSync(
     path.join(projectRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts'),
     'utf8',
@@ -532,14 +542,14 @@ function assertFilesQuotasWiring(projectRoot) {
   assert.match(appModule, /filesQuotasEnvSchema/);
   assert.match(appModule, /ForgeonFilesQuotasModule/);
 
-  const apiPackage = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'package.json'), 'utf8');
-  assert.match(apiPackage, /@forgeon\/files-quotas/);
-  assert.match(apiPackage, /pnpm --filter @forgeon\/files-quotas build/);
-  assert.equal(
-    apiPackage.indexOf('pnpm --filter @forgeon/files-quotas build') >
-      apiPackage.indexOf('pnpm --filter @forgeon/files build'),
-    true,
-  );
+  const apiPackage = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'package.json'), 'utf8');
+  assert.match(apiPackage, /@forgeon\/files-quotas/);
+  assert.match(apiPackage, /pnpm --filter @forgeon\/files-quotas build/);
+  assert.equal(
+    apiPackage.indexOf('pnpm --filter @forgeon/files-quotas build') >
+      apiPackage.indexOf('pnpm --filter @forgeon/files build'),
+    true,
+  );
 
   const filesPackage = fs.readFileSync(path.join(projectRoot, 'packages', 'files', 'package.json'), 'utf8');
   assert.doesNotMatch(filesPackage, /@forgeon\/files-quotas/);
@@ -550,13 +560,13 @@ function assertFilesQuotasWiring(projectRoot) {
     apiDockerfile,
     /COPY packages\/files-quotas\/package\.json packages\/files-quotas\/package\.json/,
   );
-  assert.match(apiDockerfile, /COPY packages\/files-quotas packages\/files-quotas/);
-  assert.match(apiDockerfile, /RUN pnpm --filter @forgeon\/files-quotas build/);
-  assert.equal(
-    apiDockerfile.indexOf('RUN pnpm --filter @forgeon/files-quotas build') >
-      apiDockerfile.indexOf('RUN pnpm --filter @forgeon/files build'),
-    true,
-  );
+  assert.match(apiDockerfile, /COPY packages\/files-quotas packages\/files-quotas/);
+  assert.match(apiDockerfile, /RUN pnpm --filter @forgeon\/files-quotas build/);
+  assert.equal(
+    apiDockerfile.indexOf('RUN pnpm --filter @forgeon/files-quotas build') >
+      apiDockerfile.indexOf('RUN pnpm --filter @forgeon/files build'),
+    true,
+  );
 
   const filesController = fs.readFileSync(
     path.join(projectRoot, 'packages', 'files', 'src', 'files.controller.ts'),
@@ -591,6 +601,22 @@ function assertFilesQuotasWiring(projectRoot) {
   const readme = fs.readFileSync(path.join(projectRoot, 'README.md'), 'utf8');
   assert.match(readme, /## Files Quotas Module/);
   assert.match(readme, /owner-based limits/i);
+
+  const filesQuotasService = fs.readFileSync(
+    path.join(projectRoot, 'packages', 'files-quotas', 'src', 'files-quotas.service.ts'),
+    'utf8',
+  );
+  assert.match(filesQuotasService, /FilesStore/);
+  assert.match(filesQuotasService, /filesStore\.countOwnerUsage/);
+  assert.doesNotMatch(filesQuotasService, /FilesService/);
+
+  const filesQuotasModule = fs.readFileSync(
+    path.join(projectRoot, 'packages', 'files-quotas', 'src', 'forgeon-files-quotas.module.ts'),
+    'utf8',
+  );
+  assert.match(filesQuotasModule, /DbPrismaModule/);
+  assert.match(filesQuotasModule, /FilesStore/);
+  assert.doesNotMatch(filesQuotasModule, /ForgeonFilesModule/);
 }
 
 function assertFilesImageWiring(projectRoot) {
@@ -611,20 +637,20 @@ function assertFilesImageWiring(projectRoot) {
   const filesPackage = fs.readFileSync(path.join(projectRoot, 'packages', 'files', 'package.json'), 'utf8');
   assert.match(filesPackage, /@forgeon\/files-image/);
 
-  const filesModule = fs.readFileSync(
-    path.join(projectRoot, 'packages', 'files', 'src', 'forgeon-files.module.ts'),
-    'utf8',
-  );
-  assert.match(filesModule, /ForgeonFilesImageModule/);
-  assert.match(
-    filesModule,
-    /imports: \[FilesConfigModule, (?:ForgeonFilesAccessModule, )?ForgeonFilesImageModule, DbPrismaModule, \.\.\.\(options\.imports \?\? \[\]\)\],/,
-  );
-
-  const filesService = fs.readFileSync(
-    path.join(projectRoot, 'packages', 'files', 'src', 'files.service.ts'),
-    'utf8',
-  );
+  const filesModule = fs.readFileSync(
+    path.join(projectRoot, 'packages', 'files', 'src', 'forgeon-files.module.ts'),
+    'utf8',
+  );
+  assert.match(filesModule, /ForgeonFilesImageModule/);
+  assert.match(
+    filesModule,
+    /imports: \[FilesConfigModule, (?:ForgeonFilesAccessModule, )?ForgeonFilesImageModule, DbPrismaModule, \.\.\.\(options\.imports \?\? \[\]\)\],/,
+  );
+
+  const filesService = fs.readFileSync(
+    path.join(projectRoot, 'packages', 'files', 'src', 'files.service.ts'),
+    'utf8',
+  );
   assert.match(filesService, /FilesImageService/);
   assert.match(filesService, /filesImageService\.sanitizeForStorage/);
   assert.match(filesService, /sanitizeForStorage\({/);

package/src/modules/files-access.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -51,6 +51,29 @@ function patchFilesPackage(targetRoot) {
   writeJson(packagePath, packageJson);
 }
 
+function patchFilesModule(targetRoot) {
+  const filePath = path.join(targetRoot, 'packages', 'files', 'src', 'forgeon-files.module.ts');
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+  content = ensureImportLine(content, "import { ForgeonFilesAccessModule } from '@forgeon/files-access';");
+
+  if (!content.includes('imports: [FilesConfigModule, ForgeonFilesAccessModule,')) {
+    content = content.replace(
+      'imports: [FilesConfigModule, ForgeonFilesImageModule, DbPrismaModule, ...(options.imports ?? [])],',
+      'imports: [FilesConfigModule, ForgeonFilesAccessModule, ForgeonFilesImageModule, DbPrismaModule, ...(options.imports ?? [])],',
+    );
+    content = content.replace(
+      'imports: [FilesConfigModule, DbPrismaModule, ...(options.imports ?? [])],',
+      'imports: [FilesConfigModule, ForgeonFilesAccessModule, DbPrismaModule, ...(options.imports ?? [])],',
+    );
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
 function patchAppModule(targetRoot) {
   const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'app.module.ts');
   if (!fs.existsSync(filePath)) {
@@ -366,6 +389,7 @@ export function applyFilesAccessModule({ packageRoot, targetRoot }) {
 
   patchApiPackage(targetRoot);
   patchFilesPackage(targetRoot);
+  patchFilesModule(targetRoot);
   patchAppModule(targetRoot);
   patchFilesController(targetRoot);
   patchHealthController(targetRoot, probeTargets);

package/templates/module-presets/files-quotas/packages/files-quotas/package.json

@@ -1,20 +1,21 @@
-{
-  "name": "@forgeon/files-quotas",
-  "version": "0.1.0",
-  "private": true,
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "tsc -p tsconfig.json"
-  },
-  "dependencies": {
-    "@forgeon/files": "workspace:*",
-    "@nestjs/common": "^11.0.1",
-    "@nestjs/config": "^4.0.0",
-    "zod": "^3.24.2"
-  },
-  "devDependencies": {
-    "@types/node": "^22.10.7",
-    "typescript": "^5.7.3"
-  }
-}
+{
+  "name": "@forgeon/files-quotas",
+  "version": "0.1.0",
+  "private": true,
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "build": "tsc -p tsconfig.json"
+  },
+  "dependencies": {
+    "@forgeon/db-prisma": "workspace:*",
+    "@forgeon/files": "workspace:*",
+    "@nestjs/common": "^11.0.1",
+    "@nestjs/config": "^4.0.0",
+    "zod": "^3.24.2"
+  },
+  "devDependencies": {
+    "@types/node": "^22.10.7",
+    "typescript": "^5.7.3"
+  }
+}

package/templates/module-presets/files-quotas/packages/files-quotas/src/files-quotas.service.ts

@@ -1,118 +1,118 @@
-import { ConflictException, Injectable } from '@nestjs/common';
-import { FilesService } from '@forgeon/files';
-import { FilesQuotasConfigService } from './files-quotas-config.service';
-import type { FilesQuotaCheckInput, FilesQuotaCheckResult } from './files-quotas.types';
-
-@Injectable()
-export class FilesQuotasService {
-  constructor(
-    private readonly filesService: FilesService,
-    private readonly configService: FilesQuotasConfigService,
-  ) {}
-
-  get enabled(): boolean {
-    return this.configService.enabled;
-  }
-
-  get limits() {
-    return {
-      maxFilesPerOwner: this.configService.maxFilesPerOwner,
-      maxBytesPerOwner: this.configService.maxBytesPerOwner,
-    };
-  }
-
-  async evaluateUpload(input: FilesQuotaCheckInput): Promise<FilesQuotaCheckResult> {
-    const limits = this.limits;
-    const emptyUsage = {
-      filesCount: 0,
-      totalBytes: 0,
-    };
-    const baseResult = {
-      limits,
-      current: emptyUsage,
-      next: {
-        filesCount: emptyUsage.filesCount + 1,
-        totalBytes: emptyUsage.totalBytes + input.fileSize,
-      },
-    };
-
-    if (!this.enabled) {
-      return {
-        allowed: true,
-        reason: 'disabled',
-        ...baseResult,
-      };
-    }
-
-    if (!input.ownerId) {
-      return {
-        allowed: true,
-        reason: 'owner-missing',
-        ...baseResult,
-      };
-    }
-
-    const usage = await this.filesService.getOwnerUsage(input.ownerType, input.ownerId);
-    const next = {
-      filesCount: usage.filesCount + 1,
-      totalBytes: usage.totalBytes + input.fileSize,
-    };
-
-    if (next.filesCount > limits.maxFilesPerOwner) {
-      return {
-        allowed: false,
-        reason: 'max-files',
-        limits,
-        current: usage,
-        next,
-      };
-    }
-    if (next.totalBytes > limits.maxBytesPerOwner) {
-      return {
-        allowed: false,
-        reason: 'max-bytes',
-        limits,
-        current: usage,
-        next,
-      };
-    }
-
-    return {
-      allowed: true,
-      reason: 'ok',
-      limits,
-      current: usage,
-      next,
-    };
-  }
-
-  async assertUploadAllowed(input: FilesQuotaCheckInput): Promise<void> {
-    const result = await this.evaluateUpload(input);
-    if (result.allowed) {
-      return;
-    }
-
-    throw new ConflictException({
-      message: 'File quota exceeded for owner',
-      details: {
-        reason: result.reason,
-        limits: result.limits,
-        current: result.current,
-        next: result.next,
-      },
-    });
-  }
-
-  async getProbeStatus(input: FilesQuotaCheckInput): Promise<{
-    status: 'ok';
-    feature: 'files-quotas';
-    result: FilesQuotaCheckResult;
-  }> {
-    const result = await this.evaluateUpload(input);
-    return {
-      status: 'ok',
-      feature: 'files-quotas',
-      result,
-    };
-  }
-}
+import { ConflictException, Injectable } from '@nestjs/common';
+import { FilesStore } from '@forgeon/files';
+import { FilesQuotasConfigService } from './files-quotas-config.service';
+import type { FilesQuotaCheckInput, FilesQuotaCheckResult } from './files-quotas.types';
+
+@Injectable()
+export class FilesQuotasService {
+  constructor(
+    private readonly filesStore: FilesStore,
+    private readonly configService: FilesQuotasConfigService,
+  ) {}
+
+  get enabled(): boolean {
+    return this.configService.enabled;
+  }
+
+  get limits() {
+    return {
+      maxFilesPerOwner: this.configService.maxFilesPerOwner,
+      maxBytesPerOwner: this.configService.maxBytesPerOwner,
+    };
+  }
+
+  async evaluateUpload(input: FilesQuotaCheckInput): Promise<FilesQuotaCheckResult> {
+    const limits = this.limits;
+    const emptyUsage = {
+      filesCount: 0,
+      totalBytes: 0,
+    };
+    const baseResult = {
+      limits,
+      current: emptyUsage,
+      next: {
+        filesCount: emptyUsage.filesCount + 1,
+        totalBytes: emptyUsage.totalBytes + input.fileSize,
+      },
+    };
+
+    if (!this.enabled) {
+      return {
+        allowed: true,
+        reason: 'disabled',
+        ...baseResult,
+      };
+    }
+
+    if (!input.ownerId) {
+      return {
+        allowed: true,
+        reason: 'owner-missing',
+        ...baseResult,
+      };
+    }
+
+    const usage = await this.filesStore.countOwnerUsage(input.ownerType, input.ownerId);
+    const next = {
+      filesCount: usage.filesCount + 1,
+      totalBytes: usage.totalBytes + input.fileSize,
+    };
+
+    if (next.filesCount > limits.maxFilesPerOwner) {
+      return {
+        allowed: false,
+        reason: 'max-files',
+        limits,
+        current: usage,
+        next,
+      };
+    }
+    if (next.totalBytes > limits.maxBytesPerOwner) {
+      return {
+        allowed: false,
+        reason: 'max-bytes',
+        limits,
+        current: usage,
+        next,
+      };
+    }
+
+    return {
+      allowed: true,
+      reason: 'ok',
+      limits,
+      current: usage,
+      next,
+    };
+  }
+
+  async assertUploadAllowed(input: FilesQuotaCheckInput): Promise<void> {
+    const result = await this.evaluateUpload(input);
+    if (result.allowed) {
+      return;
+    }
+
+    throw new ConflictException({
+      message: 'File quota exceeded for owner',
+      details: {
+        reason: result.reason,
+        limits: result.limits,
+        current: result.current,
+        next: result.next,
+      },
+    });
+  }
+
+  async getProbeStatus(input: FilesQuotaCheckInput): Promise<{
+    status: 'ok';
+    feature: 'files-quotas';
+    result: FilesQuotaCheckResult;
+  }> {
+    const result = await this.evaluateUpload(input);
+    return {
+      status: 'ok',
+      feature: 'files-quotas',
+      result,
+    };
+  }
+}

package/templates/module-presets/files-quotas/packages/files-quotas/src/forgeon-files-quotas.module.ts

@@ -1,19 +1,21 @@
-import { Module } from '@nestjs/common';
-import { ForgeonFilesModule } from '@forgeon/files';
-import { FilesQuotasConfigModule } from './files-quotas-config.module';
-import { FilesQuotasService } from './files-quotas.service';
-
-const FORGEON_FILES_UPLOAD_QUOTA_SERVICE = 'FORGEON_FILES_UPLOAD_QUOTA_SERVICE';
-
-@Module({
-  imports: [ForgeonFilesModule, FilesQuotasConfigModule],
-  providers: [
-    FilesQuotasService,
-    {
-      provide: FORGEON_FILES_UPLOAD_QUOTA_SERVICE,
-      useExisting: FilesQuotasService,
-    },
-  ],
-  exports: [FilesQuotasConfigModule, FilesQuotasService, FORGEON_FILES_UPLOAD_QUOTA_SERVICE],
-})
-export class ForgeonFilesQuotasModule {}
+import { Module } from '@nestjs/common';
+import { DbPrismaModule } from '@forgeon/db-prisma';
+import { FilesStore } from '@forgeon/files';
+import { FilesQuotasConfigModule } from './files-quotas-config.module';
+import { FilesQuotasService } from './files-quotas.service';
+
+const FORGEON_FILES_UPLOAD_QUOTA_SERVICE = 'FORGEON_FILES_UPLOAD_QUOTA_SERVICE';
+
+@Module({
+  imports: [DbPrismaModule, FilesQuotasConfigModule],
+  providers: [
+    FilesStore,
+    FilesQuotasService,
+    {
+      provide: FORGEON_FILES_UPLOAD_QUOTA_SERVICE,
+      useExisting: FilesQuotasService,
+    },
+  ],
+  exports: [FilesQuotasConfigModule, FilesQuotasService, FORGEON_FILES_UPLOAD_QUOTA_SERVICE],
+})
+export class ForgeonFilesQuotasModule {}