create-forgeon 0.3.21 → 0.3.22

package/package.json

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

package/src/modules/executor.test.mjs

@@ -611,16 +611,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/);
-
-  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-image.mjs

@@ -115,21 +115,27 @@ function patchAppModule(targetRoot) {
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
-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 { ForgeonFilesImageModule } from '@forgeon/files-image';");
-  content = content.replace(
-    'imports: [FilesConfigModule],',
-    'imports: [FilesConfigModule, ForgeonFilesImageModule],',
-  );
-
-  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
-}
+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 { ForgeonFilesImageModule } from '@forgeon/files-image';");
+  if (!content.includes('imports: [FilesConfigModule, ForgeonFilesImageModule,')) {
+    content = content.replace(
+      'imports: [FilesConfigModule, DbPrismaModule, ...(options.imports ?? [])],',
+      'imports: [FilesConfigModule, ForgeonFilesImageModule, DbPrismaModule, ...(options.imports ?? [])],',
+    );
+    content = content.replace(
+      'imports: [FilesConfigModule, ForgeonFilesAccessModule, DbPrismaModule, ...(options.imports ?? [])],',
+      'imports: [FilesConfigModule, ForgeonFilesAccessModule, ForgeonFilesImageModule, DbPrismaModule, ...(options.imports ?? [])],',
+    );
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
 
 function patchFilesController(targetRoot) {
   const filePath = path.join(targetRoot, 'packages', 'files', 'src', 'files.controller.ts');