create-forgeon 0.3.15 → 0.3.17

package/src/modules/scheduler.mjs

@@ -1,17 +1,15 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
   ensureBuildSteps,
-  ensureClassMember,
   ensureDependency,
-  ensureImportLine,
   ensureLineAfter,
   ensureLineBefore,
-  ensureLoadItem,
-  ensureValidatorSchema,
   upsertEnvLines,
 } from './shared/patch-utils.mjs';
+import { patchAppModuleRegistration, patchHealthControllerServiceProbe } from './shared/nest-runtime-wiring.mjs';
+import { ensureWebProbeDefinition, resolveProbeTargets } from './shared/probes.mjs';
 
 function copyFromPreset(packageRoot, targetRoot, relativePath) {
   const source = path.join(packageRoot, 'templates', 'module-presets', 'scheduler', relativePath);
@@ -35,169 +33,47 @@ function patchApiPackage(targetRoot) {
 }
 
 function patchAppModule(targetRoot) {
-  const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'app.module.ts');
-  if (!fs.existsSync(filePath)) {
-    return;
-  }
-
-  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
-  content = ensureImportLine(
-    content,
-    "import { ForgeonSchedulerModule, schedulerConfig, schedulerEnvSchema } from '@forgeon/scheduler';",
-  );
-  content = ensureLoadItem(content, 'schedulerConfig');
-  content = ensureValidatorSchema(content, 'schedulerEnvSchema');
-
-  if (!content.includes('    ForgeonSchedulerModule,')) {
-    if (content.includes('    ForgeonQueueModule,')) {
-      content = ensureLineAfter(content, '    ForgeonQueueModule,', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    ForgeonI18nModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonI18nModule.register({', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    ForgeonAuthModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register({', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    ForgeonAuthModule.register(),')) {
-      content = ensureLineBefore(content, '    ForgeonAuthModule.register(),', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    DbPrismaModule,')) {
-      content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    ForgeonLoggerModule,')) {
-      content = ensureLineAfter(content, '    ForgeonLoggerModule,', '    ForgeonSchedulerModule,');
-    } else if (content.includes('    ForgeonSwaggerModule,')) {
-      content = ensureLineAfter(content, '    ForgeonSwaggerModule,', '    ForgeonSchedulerModule,');
-    } else {
-      content = ensureLineAfter(content, '    CoreErrorsModule,', '    ForgeonSchedulerModule,');
-    }
-  }
-
-  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+  patchAppModuleRegistration(targetRoot, {
+    importLine: "import { ForgeonSchedulerModule, schedulerConfig, schedulerEnvSchema } from '@forgeon/scheduler';",
+    loadItem: 'schedulerConfig',
+    envSchema: 'schedulerEnvSchema',
+    moduleLine: '    ForgeonSchedulerModule,',
+    beforeAnchors: [
+      '    ForgeonI18nModule.register({',
+      '    ForgeonAccountsModule.register({',
+      '    ForgeonAccountsModule.register(),',
+    ],
+    afterAnchors: [
+      '    ForgeonQueueModule,',
+      '    DbPrismaModule,',
+      '    ForgeonLoggerModule,',
+      '    ForgeonSwaggerModule,',
+    ],
+  });
 }
 
-function patchHealthController(targetRoot) {
-  const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts');
-  if (!fs.existsSync(filePath)) {
-    return;
-  }
-
-  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
-  content = ensureImportLine(content, "import { ForgeonSchedulerService } from '@forgeon/scheduler';");
-
-  if (!content.includes('private readonly schedulerService: ForgeonSchedulerService')) {
-    const constructorMatch = content.match(/constructor\(([\s\S]*?)\)\s*\{/m);
-    if (constructorMatch) {
-      const original = constructorMatch[0];
-      const inner = constructorMatch[1].trimEnd();
-      const normalizedInner = inner.replace(/,\s*$/, '');
-      const separator = normalizedInner.length > 0 ? ',' : '';
-      const next = `constructor(${normalizedInner}${separator}
-    private readonly schedulerService: ForgeonSchedulerService,
-  ) {`;
-      content = content.replace(original, next);
-    } else {
-      const classAnchor = 'export class HealthController {';
-      if (content.includes(classAnchor)) {
-        content = content.replace(
-          classAnchor,
-          `${classAnchor}
-  constructor(private readonly schedulerService: ForgeonSchedulerService) {}
-`,
-        );
-      }
-    }
-  }
-
-  if (!content.includes("@Get('scheduler')")) {
-    const method = `
-  @Get('scheduler')
-  async getSchedulerProbe() {
-    return this.schedulerService.getProbeStatus();
-  }
-`;
-    content = ensureClassMember(content, 'HealthController', method, { beforeNeedle: 'private translate(' });
-  }
-
-  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+function patchHealthController(targetRoot, probeTargets) {
+  patchHealthControllerServiceProbe(targetRoot, probeTargets, {
+    importLine: "import { ForgeonSchedulerService } from '@forgeon/scheduler';",
+    constructorMember: 'private readonly schedulerService: ForgeonSchedulerService',
+    routePath: 'scheduler',
+    methodName: 'getSchedulerProbe',
+    serviceCall: 'this.schedulerService.getProbeStatus()',
+  });
 }
 
-function patchWebApp(targetRoot) {
-  const filePath = path.join(targetRoot, 'apps', 'web', 'src', 'App.tsx');
-  if (!fs.existsSync(filePath)) {
-    return;
-  }
-
-  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
-  content = content
-    .replace(/^\s*\{\/\* forgeon:probes:actions:start \*\/\}\r?\n?/gm, '')
-    .replace(/^\s*\{\/\* forgeon:probes:actions:end \*\/\}\r?\n?/gm, '')
-    .replace(/^\s*\{\/\* forgeon:probes:results:start \*\/\}\r?\n?/gm, '')
-    .replace(/^\s*\{\/\* forgeon:probes:results:end \*\/\}\r?\n?/gm, '');
-
-  if (!content.includes('schedulerProbeResult')) {
-    const stateAnchors = [
-      '  const [queueProbeResult, setQueueProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [filesImageProbeResult, setFilesImageProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [filesQuotasProbeResult, setFilesQuotasProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [filesAccessProbeResult, setFilesAccessProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [filesVariantsProbeResult, setFilesVariantsProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [filesProbeResult, setFilesProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [rbacProbeResult, setRbacProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [rateLimitProbeResult, setRateLimitProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [authProbeResult, setAuthProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);',
-      '  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);',
-    ];
-    const stateAnchor = stateAnchors.find((line) => content.includes(line));
-    if (stateAnchor) {
-      content = ensureLineAfter(
-        content,
-        stateAnchor,
-        '  const [schedulerProbeResult, setSchedulerProbeResult] = useState<ProbeResult | null>(null);',
-      );
-    }
-  }
-
-  if (!content.includes('Check scheduler health')) {
-    const probePath = content.includes("runProbe(setHealthResult, '/health')")
-      ? '/health/scheduler'
-      : '/api/health/scheduler';
-    const button = `        <button onClick={() => runProbe(setSchedulerProbeResult, '${probePath}')}>
-          Check scheduler health
-        </button>`;
-
-    const actionsStart = content.indexOf('<div className="actions">');
-    if (actionsStart >= 0) {
-      const actionsEnd = content.indexOf('\n      </div>', actionsStart);
-      if (actionsEnd >= 0) {
-        content = `${content.slice(0, actionsEnd)}\n${button}${content.slice(actionsEnd)}`;
-      }
-    }
-  }
-
-  if (!content.includes("{renderResult('Scheduler probe response', schedulerProbeResult)}")) {
-    const resultLine = "      {renderResult('Scheduler probe response', schedulerProbeResult)}";
-    const networkLine = '      {networkError ? <p className="error">{networkError}</p> : null}';
-    if (content.includes(networkLine)) {
-      content = content.replace(networkLine, `${resultLine}\n${networkLine}`);
-    } else {
-      const anchors = [
-        "{renderResult('Queue probe response', queueProbeResult)}",
-        "{renderResult('Files image probe response', filesImageProbeResult)}",
-        "{renderResult('Files quotas probe response', filesQuotasProbeResult)}",
-        "{renderResult('Files access probe response', filesAccessProbeResult)}",
-        "{renderResult('Files variants probe response', filesVariantsProbeResult)}",
-        "{renderResult('Files probe response', filesProbeResult)}",
-        "{renderResult('RBAC probe response', rbacProbeResult)}",
-        "{renderResult('Rate limit probe response', rateLimitProbeResult)}",
-        "{renderResult('Auth probe response', authProbeResult)}",
-        "{renderResult('DB probe response', dbProbeResult)}",
-        "{renderResult('Validation probe response', validationProbeResult)}",
-      ];
-      const anchor = anchors.find((line) => content.includes(line));
-      if (anchor) {
-        content = ensureLineAfter(content, anchor, resultLine);
-      }
-    }
-  }
-
-  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+function registerWebProbe(targetRoot, probeTargets) {
+  ensureWebProbeDefinition({
+    targetRoot,
+    probeTargets,
+    definition: {
+      id: 'scheduler',
+      title: 'Scheduler',
+      buttonLabel: 'Check scheduler health',
+      resultTitle: 'Scheduler probe response',
+      path: '/health/scheduler',
+    },
+  });
 }
 
 function patchApiDockerfile(targetRoot) {
@@ -216,7 +92,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files-s3/package.json packages/files-s3/package.json',
     'COPY packages/files-local/package.json packages/files-local/package.json',
     'COPY packages/files/package.json packages/files/package.json',
-    'COPY packages/auth-api/package.json packages/auth-api/package.json',
+    'COPY packages/accounts-api/package.json packages/accounts-api/package.json',
     'COPY packages/rbac/package.json packages/rbac/package.json',
     'COPY packages/rate-limit/package.json packages/rate-limit/package.json',
     'COPY packages/logger/package.json packages/logger/package.json',
@@ -237,7 +113,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/files-s3 packages/files-s3',
     'COPY packages/files-local packages/files-local',
     'COPY packages/files packages/files',
-    'COPY packages/auth-api packages/auth-api',
+    'COPY packages/accounts-api packages/accounts-api',
     'COPY packages/rbac packages/rbac',
     'COPY packages/rate-limit packages/rate-limit',
     'COPY packages/logger packages/logger',
@@ -279,7 +155,7 @@ function patchCompose(targetRoot) {
       /^(\s+FILES_S3_MAX_ATTEMPTS:.*)$/m,
       /^(\s+FILES_LOCAL_ROOT:.*)$/m,
       /^(\s+FILES_PUBLIC_BASE_PATH:.*)$/m,
-      /^(\s+AUTH_DEMO_PASSWORD:.*)$/m,
+      /^(\s+AUTH_ARGON2_PARALLELISM:.*)$/m,
       /^(\s+THROTTLE_TRUST_PROXY:.*)$/m,
       /^(\s+LOGGER_REQUEST_ID_HEADER:.*)$/m,
       /^(\s+SWAGGER_DOCS_PATH:.*)$/m,
@@ -346,11 +222,12 @@ Operational notes:
 
 export function applySchedulerModule({ packageRoot, targetRoot }) {
   copyFromPreset(packageRoot, targetRoot, path.join('packages', 'scheduler'));
-
+  const probeTargets = resolveProbeTargets({ targetRoot, moduleId: 'scheduler' });
+
   patchApiPackage(targetRoot);
   patchAppModule(targetRoot);
-  patchHealthController(targetRoot);
-  patchWebApp(targetRoot);
+  patchHealthController(targetRoot, probeTargets);
+  registerWebProbe(targetRoot, probeTargets);
   patchApiDockerfile(targetRoot);
   patchCompose(targetRoot);
   patchReadme(targetRoot);
@@ -365,4 +242,7 @@ export function applySchedulerModule({ packageRoot, targetRoot }) {
     'SCHEDULER_TIMEZONE=UTC',
     'SCHEDULER_HEARTBEAT_CRON=*/5 * * * *',
   ]);
-}
+}
+
+
+

package/src/modules/shared/files-runtime-wiring.mjs

@@ -0,0 +1,81 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { ensureLineAfter, ensureLineBefore } from './patch-utils.mjs';
+
+function normalize(content) {
+  return content.replace(/\r\n/g, '\n');
+}
+
+export function readPreferredFilesStorageDriver(targetRoot) {
+  const envPath = path.join(targetRoot, 'apps', 'api', '.env.example');
+  if (!fs.existsSync(envPath)) {
+    return 'local';
+  }
+
+  const content = normalize(fs.readFileSync(envPath, 'utf8'));
+  const match = content.match(/^FILES_STORAGE_DRIVER=(local|s3)$/m);
+  return match?.[1] ?? 'local';
+}
+
+export function resolveFilesStorageRuntimeModule(targetRoot) {
+  const hasLocal = fs.existsSync(path.join(targetRoot, 'packages', 'files-local', 'package.json'));
+  const hasS3 = fs.existsSync(path.join(targetRoot, 'packages', 'files-s3', 'package.json'));
+  const preferredDriver = readPreferredFilesStorageDriver(targetRoot);
+
+  if (preferredDriver === 's3' && hasS3) {
+    return 'ForgeonFilesS3StorageModule';
+  }
+  if (preferredDriver === 'local' && hasLocal) {
+    return 'ForgeonFilesLocalStorageModule';
+  }
+  if (hasLocal) {
+    return 'ForgeonFilesLocalStorageModule';
+  }
+  if (hasS3) {
+    return 'ForgeonFilesS3StorageModule';
+  }
+  return null;
+}
+
+export function upsertFilesModuleRegistration(content, storageRuntimeModuleName = null) {
+  const runtimeImports = ['ForgeonFilesDbPrismaModule'];
+  if (storageRuntimeModuleName) {
+    runtimeImports.push(storageRuntimeModuleName);
+  }
+
+  const moduleBlock = `    ForgeonFilesModule.register({
+      imports: [${runtimeImports.join(', ')}],
+    }),`;
+
+  if (content.includes('ForgeonFilesModule.register({')) {
+    return content.replace(
+      / {4}ForgeonFilesModule\.register\(\{[\s\S]*? {4}\}\),/m,
+      moduleBlock,
+    );
+  }
+
+  if (content.includes('    ForgeonFilesModule,')) {
+    return content.replace('    ForgeonFilesModule,', moduleBlock);
+  }
+
+  if (content.includes('    ForgeonI18nModule.register({')) {
+    return ensureLineBefore(content, '    ForgeonI18nModule.register({', moduleBlock);
+  }
+  if (content.includes('    ForgeonAccountsModule.register({')) {
+    return ensureLineBefore(content, '    ForgeonAccountsModule.register({', moduleBlock);
+  }
+  if (content.includes('    ForgeonAccountsModule.register(),')) {
+    return ensureLineBefore(content, '    ForgeonAccountsModule.register(),', moduleBlock);
+  }
+  if (content.includes('    DbPrismaModule,')) {
+    return ensureLineAfter(content, '    DbPrismaModule,', moduleBlock);
+  }
+  if (content.includes('    ForgeonLoggerModule,')) {
+    return ensureLineAfter(content, '    ForgeonLoggerModule,', moduleBlock);
+  }
+  if (content.includes('    ForgeonSwaggerModule,')) {
+    return ensureLineAfter(content, '    ForgeonSwaggerModule,', moduleBlock);
+  }
+  return ensureLineAfter(content, '    CoreErrorsModule,', moduleBlock);
+}
+

package/src/modules/shared/nest-runtime-wiring.mjs

@@ -0,0 +1,110 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import {
+  ensureClassMember,
+  ensureImportLine,
+  ensureLineAfter,
+  ensureLineBefore,
+  ensureLoadItem,
+  ensureValidatorSchema,
+} from './patch-utils.mjs';
+
+function normalize(content) {
+  return content.replace(/\r\n/g, '\n');
+}
+
+export function patchAppModuleRegistration(targetRoot, options) {
+  const {
+    importLine,
+    loadItem,
+    envSchema,
+    moduleLine,
+    afterAnchors = [],
+    beforeAnchors = [],
+    fallbackAnchor = '    CoreErrorsModule,',
+  } = options;
+
+  const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'app.module.ts');
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  let content = normalize(fs.readFileSync(filePath, 'utf8'));
+  content = ensureImportLine(content, importLine);
+  content = ensureLoadItem(content, loadItem);
+  content = ensureValidatorSchema(content, envSchema);
+
+  if (!content.includes(moduleLine)) {
+    const beforeAnchor = beforeAnchors.find((anchor) => content.includes(anchor));
+    if (beforeAnchor) {
+      content = ensureLineBefore(content, beforeAnchor, moduleLine);
+    } else {
+      const afterAnchor = afterAnchors.find((anchor) => content.includes(anchor)) ?? fallbackAnchor;
+      content = ensureLineAfter(content, afterAnchor, moduleLine);
+    }
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
+export function patchHealthControllerServiceProbe(targetRoot, probeTargets, options) {
+  if (!probeTargets.allowApi) {
+    return;
+  }
+
+  const {
+    importLine,
+    constructorMember,
+    routePath,
+    methodName,
+    serviceCall,
+    className = 'HealthController',
+    classAnchor = 'export class HealthController {',
+    beforeNeedles = [],
+    beforeNeedle = 'private translate(',
+  } = options;
+
+  const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts');
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  let content = normalize(fs.readFileSync(filePath, 'utf8'));
+  content = ensureImportLine(content, importLine);
+
+  if (!content.includes(constructorMember)) {
+    const constructorMatch = content.match(/constructor\(([\s\S]*?)\)\s*\{/m);
+    if (constructorMatch) {
+      const original = constructorMatch[0];
+      const inner = constructorMatch[1].trimEnd();
+      const normalizedInner = inner.replace(/,\s*$/, '');
+      const separator = normalizedInner.length > 0 ? ',' : '';
+      const next = `constructor(${normalizedInner}${separator}
+    ${constructorMember},
+  ) {`;
+      content = content.replace(original, next);
+    } else if (content.includes(classAnchor)) {
+      content = content.replace(
+        classAnchor,
+        `${classAnchor}
+  constructor(${constructorMember}) {}
+`,
+      );
+    }
+  }
+
+  const routeDecorator = `@Get('${routePath}')`;
+  if (!content.includes(routeDecorator)) {
+    const method = `
+  ${routeDecorator}
+  async ${methodName}() {
+    return ${serviceCall};
+  }
+`;
+    const resolvedBeforeNeedle =
+      beforeNeedles.find((needle) => content.includes(needle)) ?? beforeNeedle;
+    content = ensureClassMember(content, className, method, { beforeNeedle: resolvedBeforeNeedle });
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}

package/src/modules/shared/patch-utils.mjs

@@ -113,6 +113,34 @@ export function ensureImportLine(content, importLine) {
   return `${content.slice(0, insertAt)}\n${importLine}${content.slice(insertAt)}`;
 }
 
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+export function ensureNamedImportSpecifier(content, moduleSpecifier, importName) {
+  const pattern = new RegExp(
+    `import\\s*\\{([^}]*)\\}\\s*from ['"]${escapeRegExp(moduleSpecifier)}['"];`,
+    'm',
+  );
+  const match = content.match(pattern);
+  if (!match) {
+    return ensureImportLine(content, `import { ${importName} } from '${moduleSpecifier}';`);
+  }
+
+  const names = match[1]
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (names.includes(importName)) {
+    return content;
+  }
+
+  names.push(importName);
+  const replacement = `import { ${names.join(', ')} } from '${moduleSpecifier}';`;
+  return content.replace(pattern, replacement);
+}
+
 function findClassRange(content, className) {
   const classPattern = new RegExp(`export\\s+class\\s+${className}\\b`);
   const classMatch = classPattern.exec(content);
@@ -259,4 +287,4 @@ export function ensureNestCommonImport(content, importName) {
 
   const replacement = `import { ${names.join(', ')} } from '@nestjs/common';`;
   return content.replace(pattern, replacement);
-}
+}