@nutin/cli 2.0.0 → 2.1.1

package/templates/base/tools/generator/generator.js.hbs

@@ -2,23 +2,11 @@
 
 import path from "path";
 import { allFormats, getLastWord, print, promptBoolean, errorExit } from "../utils/index.js";
-import { generateFile, appendToIndex, generateLocalesJson } from "./handle-file.js";
+import fs from "fs";
+import { generateFile, generateLocalesJson } from "./handle-file.js";
 import { serviceTemplate, componentTemplate, viewTemplate, htmlTemplate, scssTemplate, testTemplate } from "./templates/index.js";
 import nutinConfig from "../../nutin.config.js";
 
-// Constants and Setup
-const [, , rawType, rawFullPath] = process.argv;
-
-if (!rawType || !rawFullPath) {
-  showUsageAndExit("Missing arguments.");
-  process.exit(1);
-}
-
-const type = allFormats(rawType);
-const fullPath = allFormats(rawFullPath);
-const name = allFormats(getLastWord(fullPath.kebab));
-const targetPath = path.join('src', 'app', `${type.kebab}s/${fullPath.kebab}`);
-
 // Creator Mapping
 const creators = {
   service: async (name, targetPath) => {
@@ -26,8 +14,7 @@ const creators = {
     print.section(`Generating service: ${name.capitalized}`);
     try {
       generateFile({ name, targetPath, templateFn: serviceTemplate, suffix: suffix });
-      appendToIndex({ name, targetPath, suffix: suffix });
-      if (nutinConfig.generator.generateTest) await generateTest({ name, targetPath, suffix: suffix });
+      await generateTest({ name, targetPath, suffix: suffix });
     } catch (err) {
       handleError("Failed to generate service", err);
     }
@@ -39,10 +26,9 @@ const creators = {
     try {
       generateFile({ name, targetPath, templateFn: componentTemplate, suffix: suffix });
       generateFile({ name, targetPath, templateFn: htmlTemplate, suffix: suffix, extension: 'html' });
-      if (nutinConfig.generator.generateStylesheet) generateFile({ name, targetPath, templateFn: scssTemplate, suffix: suffix, extension: 'scss' });
-      if (nutinConfig.generator.generateLocales) await generateLocales({ targetPath, name });
-      appendToIndex({ name, targetPath, suffix: suffix });
-      if (nutinConfig.generator.generateTest) await generateTest({ name, targetPath, suffix });
+      generateFile({ name, targetPath, templateFn: scssTemplate, suffix: suffix, extension: 'scss' });
+      await generateLocales({ targetPath, name, isView: false });
+      await generateTest({ name, targetPath, suffix });
     } catch (err) {
       handleError("Failed to generate component", err);
     }
@@ -54,20 +40,39 @@ const creators = {
     try {
       generateFile({ name, targetPath, templateFn: viewTemplate, suffix: suffix });
       generateFile({ name, targetPath, templateFn: htmlTemplate, suffix: suffix, extension: 'html' });
-      if (nutinConfig.generator.generateStylesheet) generateFile({ name, targetPath, templateFn: scssTemplate, suffix: suffix, extension: 'scss' });
-      if (nutinConfig.generator.generateLocales) await generateLocales({ targetPath, name });
-      appendToIndex({ name, targetPath, suffix: suffix });
-      if (nutinConfig.generator.generateTest) await generateTest({ name, targetPath, suffix });
+      generateFile({ name, targetPath, templateFn: scssTemplate, suffix: suffix, extension: 'scss' });
+      await generateLocales({ targetPath, name, isView: true });
+      await generateTest({ name, targetPath, suffix });
     } catch (err) {
       handleError("Failed to generate view", err);
     }
   },
 };
 
+// Constants and Setup
+const [, , rawType, rawFullPath] = process.argv;
+
+if (!rawType || !rawFullPath) {
+  showUsageAndExit("Missing arguments.");
+  process.exit(1);
+}
+
+const type = allFormats(rawType);
+const fullPath = allFormats(rawFullPath);
+const name = allFormats(getLastWord(fullPath.kebab));
+const targetPath = path.join('src', 'app', fullPath.kebab);
+
 // Main Execution
 const create = creators[type.kebab];
 
 if (create) {
+  // Folder names carry no type suffix, so a view and a component with the same path would
+  // share one folder (and clobber each other's locales/) — refuse before writing anything.
+  if (fs.existsSync(targetPath) && fs.readdirSync(targetPath).length > 0) {
+    print.boldError(`\nA folder with this name already exists: ${targetPath}`);
+    print.warn("Pick another path, e.g. user/user-view and user/user-card.");
+    process.exit(1);
+  }
   await create(name, targetPath);
   print.boldSuccess(`\n${type.capitalized} ${name.capitalized} generated in ${targetPath}.\n`)
 } else {
@@ -77,31 +82,11 @@ if (create) {
 
 // Helper Functions
 async function generateTest({ targetPath, name, suffix }) {
-  let isGenerate = true;
-  if (!nutinConfig.testinNutin.includeApp) {
-    print.warn('⚠️ Enable includeApp in nutin.config.js testinNutin object to use test files.');
-    if (!process.stdin.isTTY) {
-      print.warn('Non-interactive shell detected — skipping test file generation.');
-      isGenerate = false;
-    } else {
-      isGenerate = await promptBoolean('Do you want to generate the test file anyway ?');
-    }
-  }
-  if (isGenerate) generateFile({ targetPath, name, templateFn: testTemplate, extension: 'test.js', suffix: suffix });
+  if (nutinConfig.testinNutin.includeApp) generateFile({ targetPath, name, templateFn: testTemplate, extension: 'test.js', suffix: suffix });
 }
 
-async function generateLocales({ targetPath, name }) {
-  let isGenerate = true;
-  if (!nutinConfig.i18n) {
-    print.warn('⚠️ Enable i18n in nutin.config.js to use json-based content per language.');
-    if (!process.stdin.isTTY) {
-      print.warn('Non-interactive shell detected — skipping locales file generation.');
-      isGenerate = false;
-    } else {
-      isGenerate = await promptBoolean('Do you want to generate the locales file(s) anyway ?');
-    }
-  }
-  if (isGenerate) generateLocalesJson({ targetPath, name });
+async function generateLocales({ targetPath, name, isView }) {
+  if (nutinConfig.i18n) generateLocalesJson({ targetPath, name, isView });
 }
 
 function showUsageAndExit(message) {

package/templates/base/tools/generator/handle-file.js.hbs

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import path from 'path';
 import { print, LANGUAGES } from '../utils/index.js';
 import { localeTemplate } from './templates/index.js';
 
@@ -22,32 +21,11 @@ export function generateFile({
   fs.writeFileSync(filePath, template);
 }
 
-export function appendToIndex({ name, targetPath, suffix }) {
-  const absTargetPath = path.resolve(process.cwd(), targetPath);
-
-  const parts = targetPath.split(path.sep);
-  const basePath = parts.slice(0, 3).join(path.sep);
-
-  const indexFilePath = path.join(basePath, 'index.ts');
-
-  const absFilePath = path.join(absTargetPath, `${name.kebab}.${suffix}.js`);
-  const relPath = path.relative(basePath, absFilePath).replace(/\\/g, '/');
-
-  const lineToAppend = `export * from './${relPath}';\n`;
-
-  try {
-    fs.appendFileSync(indexFilePath, lineToAppend, 'utf8');
-    print.gray(`${suffix}s/index.ts updated.`);
-  } catch (err) {
-    throw new Error(`Failed to update ${indexFilePath}: ${err.message}`, { cause: err });
-  }
-}
-
-export function generateLocalesJson({ targetPath, name }) {
+export function generateLocalesJson({ targetPath, name, isView }) {
   const localesDir = `${targetPath}/locales`;
   fs.mkdirSync(localesDir, { recursive: true });
 
-  const template = localeTemplate(name);
+  const template = localeTemplate(name, isView);
 
   const failedLangs = [];
   for (const lang of LANGUAGES) {

package/templates/base/tools/generator/handle-file.test.js.hbs

@@ -1,22 +1,19 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { generateFile, appendToIndex } from './handle-file.js';
+import { generateFile } from './handle-file.js';
 
 describe('handle-file', () => {
   let tmpDir;
-  let originalCwd;
   let exitSpy;
 
   beforeEach(() => {
     tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'nutin-handle-file-'));
-    originalCwd = process.cwd();
     exitSpy = spyOn(process, 'exit').andCallFake(() => {});
   });
 
   afterEach(() => {
     exitSpy.restore();
-    process.chdir(originalCwd);
     fs.rmSync(tmpDir, { recursive: true, force: true });
   });
 
@@ -53,20 +50,4 @@ describe('handle-file', () => {
     expect(exitSpy.callCount).toBe(1);
     expect(exitSpy.lastCall).toEqual([1]);
   });
-
-  it('appendToIndex appends an export line to the barrel three segments up from targetPath', () => {
-    process.chdir(tmpDir);
-    const basePath = path.join('src', 'app', 'components');
-    fs.mkdirSync(basePath, { recursive: true });
-    fs.writeFileSync(path.join(basePath, 'index.ts'), "export * from './existing.js';\n");
-
-    const targetPath = path.join('src', 'app', 'components', 'widget');
-    const name = { kebab: 'widget', pascal: 'Widget', camel: 'widget', capitalized: 'Widget' };
-
-    // appendToIndex prints a "index.ts updated" log via console.info
-    silenceConsole('info', () => appendToIndex({ name, targetPath, suffix: 'component' }));
-
-    const indexContent = fs.readFileSync(path.join(basePath, 'index.ts'), 'utf8');
-    expect(indexContent).toBe("export * from './existing.js';\nexport * from './widget/widget.component.js';\n");
-  });
 });

package/templates/base/tools/generator/templates/locale/locale.template.js.hbs

@@ -1,4 +1,8 @@
-export const localeTemplate = (name) => `{
+export const localeTemplate = (name, isView) => isView ? `{
+  "title": "${name.capitalized}",
+  "default": "${name.pascal} works !"
+}
+` : `{
   "default": "${name.pascal} works !"
 }
 `;

package/templates/base/tools/generator/templates/locale/locale.template.test.js.hbs

@@ -2,6 +2,16 @@ import { localeTemplate } from './locale.template.js';
 
 describe('localeTemplate', () => {
   it('renders a locale JSON stub with a "default" key', () => {
-    expect(localeTemplate({ pascal: 'Widget' })).toBe('{\n  "default": "Widget works !"\n}\n');
+    expect(localeTemplate({ pascal: 'Widget', capitalized: 'Widget' })).toBe('{\n  "default": "Widget works !"\n}\n');
+  });
+
+  it('does not include a "title" key when isView is false', () => {
+    expect(localeTemplate({ pascal: 'Widget', capitalized: 'Widget' }, false)).toBe('{\n  "default": "Widget works !"\n}\n');
+  });
+
+  it('includes a top-level "title" key seeded from the capitalized name when isView is true', () => {
+    expect(localeTemplate({ pascal: 'Widget', capitalized: 'Widget' }, true)).toBe(
+      '{\n  "title": "Widget",\n  "default": "Widget works !"\n}\n'
+    );
   });
 });

package/templates/base/tools/generator/templates/view/view.template.js.hbs

@@ -10,7 +10,7 @@ const template = \`${htmlTemplate}\`;
 
 export class ${name.pascal}View extends View {
   constructor() {
-    super({template});
+    super({ template, viewName: '${name.kebab}' });
   }
 
 }

package/templates/base/tools/generator/templates/view/view.template.test.js.hbs

@@ -2,7 +2,7 @@ import { viewTemplate } from './view.template.js';
 
 describe('viewTemplate', () => {
   it('renders a view class importing View via the relative core path', () => {
-    const name = { pascal: 'Widget' };
+    const name = { kebab: 'widget', pascal: 'Widget' };
     const targetPath = 'src/app/components/widget';
 
     // The generator always leaves the html body as a placeholder — the builder
@@ -14,7 +14,7 @@ const template = \`__TEMPLATE_PLACEHOLDER__\`;
 
 export class WidgetView extends View {
   constructor() {
-    super({template});
+    super({ template, viewName: 'widget' });
   }
 
 }

package/templates/base/tools/utils/build-lock.js.hbs

@@ -0,0 +1,69 @@
+import * as fs from 'fs';
+import path from 'path';
+import { print } from './print.js';
+
+// Guards the whole build pipeline against concurrent invocations — e.g. a manual
+// `{{packageManager}} run build` running alongside the dev watcher's auto-rebuild, or (as actually
+// happened) multiple orphaned watcher.js processes each kicking off their own build.
+// copy-static.js starts every run by wiping and recreating dist-build; two builds
+// doing that at once corrupt each other's output (missing/non-empty dist-build,
+// merge-templates.js "has both an inline and external template" conflicts, etc).
+const LOCK_DIR = path.resolve('.build-lock');
+const STALE_MS = 5 * 60 * 1000; // a full build takes seconds — anything older is a dead leftover
+const POLL_MS = 200;
+const MAX_WAIT_MS = 2 * 60 * 1000;
+
+function tryAcquire() {
+  try {
+    fs.mkdirSync(LOCK_DIR);
+    fs.writeFileSync(path.join(LOCK_DIR, 'pid'), String(process.pid));
+    return true;
+  } catch (err) {
+    if (err.code === 'EEXIST') return false;
+    throw err;
+  }
+}
+
+function isStale() {
+  try {
+    const { mtimeMs } = fs.statSync(LOCK_DIR);
+    return Date.now() - mtimeMs > STALE_MS;
+  } catch {
+    return true; // lock vanished mid-check (released concurrently) — treat as free
+  }
+}
+
+function release() {
+  try {
+    fs.rmSync(LOCK_DIR, { recursive: true, force: true });
+  } catch {
+    // already released
+  }
+}
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export async function acquireBuildLock() {
+  const start = Date.now();
+  let warned = false;
+
+  while (!tryAcquire()) {
+    if (isStale()) {
+      release();
+      continue;
+    }
+
+    if (!warned) {
+      print.boldInfo('\nAnother build is already in progress — waiting for it to finish...');
+      warned = true;
+    }
+
+    if (Date.now() - start > MAX_WAIT_MS) {
+      throw new Error(`Timed out waiting for the build lock (${LOCK_DIR}) held by another process.`);
+    }
+
+    await sleep(POLL_MS);
+  }
+
+  process.on('exit', release);
+}

package/templates/base/tools/utils/index.js.hbs

@@ -6,3 +6,4 @@ export * from './run-script.js';
 export * from './prompt-boolean.js';
 export * from './languages.js';
 export * from './error-exit.js';
+export * from './build-lock.js';

package/templates/features/docker/tools/docker/Dockerfile.template.hbs

@@ -1,5 +1,5 @@
-ARG NODE_VERSION=22.23.2
-ARG ALPINE_VERSION=3.20
+ARG NODE_VERSION=24.21.0
+ARG ALPINE_VERSION=3.24
 ARG PORT="__PORTS_PLACEHOLDER__"
 
 FROM node:${NODE_VERSION}-alpine AS builder

package/templates/features/docker/tools/docker/nginx.conf.template

@@ -42,6 +42,11 @@ server {
     __PORTS_PLACEHOLDER__
     server_name _;
 
+    # Keep nginx's own automatic redirects (e.g. the missing-trailing-slash 301 on a
+    # prerendered route directory) relative, so they never leak this container's
+    # internal port/scheme when served behind a reverse proxy or a remapped port.
+    absolute_redirect off;
+
     # ---------------------------
     # ROOT + ROUTING
     # ---------------------------
@@ -51,6 +56,10 @@ server {
     # Hide nginx version
     server_tokens off;
 
+    # With i18n enabled, redirects bare "/" to the default language so the served URL
+    # always matches each page's canonical/og:url (filled in by validate-docker).
+    __ROOT_REDIRECT_PLACEHOLDER__
+
     # SPA routing: serve index.html for unknown paths
     location / {
         try_files $uri $uri/ /index.html;
@@ -112,6 +121,12 @@ server {
     # --------------------------
     error_page 404 /404.html;
 
+    # A route directory that exists on disk but has no index.html of its own (e.g. a
+    # parent route whose only prerendered pages are its children) makes try_files'
+    # $uri/ candidate match the directory and stop there, returning 403 instead of
+    # falling through to the SPA shell. Serve the shell for that case too.
+    error_page 403 = /index.html;
+
     location = /404.html {
         internal;
         try_files /404.html =404;

package/templates/features/docker/tools/docker/scripts/validate-docker.js.hbs

@@ -1,3 +1,4 @@
+import fs from 'fs';
 import path from 'path';
 import { errorExit } from '../../utils/index.js';
 import nutinConfig from '../../../nutin.config.js';
@@ -6,6 +7,16 @@ import { renderFromTemplate } from './render-docker-template.js';
 
 const DOCKER_DIR = path.join(process.cwd(), 'tools', 'docker');
 const PLACEHOLDER = '__PORTS_PLACEHOLDER__';
+const ROOT_REDIRECT_PLACEHOLDER = '__ROOT_REDIRECT_PLACEHOLDER__';
+
+// Only i18n builds serve every page under a language prefix — without it, "/" is a real page.
+function rootRedirect() {
+  if (!nutinConfig.i18n) return '';
+
+  const languagesConfigPath = path.join(process.cwd(), 'config', 'languages.json');
+  const { defaultLanguage } = JSON.parse(fs.readFileSync(languagesConfigPath, 'utf-8'));
+  return `location = / {\n        return 301 /${defaultLanguage}/$is_args$args;\n    }`;
+}
 
 async function validateDocker() {
   let ports;
@@ -22,6 +33,7 @@ async function validateDocker() {
 
   await renderFromTemplate(DOCKER_DIR, 'nginx.conf.template', 'nginx.conf', [
     [PLACEHOLDER, ports.map((port) => `listen ${port};`).join('\n    ')],
+    [ROOT_REDIRECT_PLACEHOLDER, rootRedirect()],
   ]).catch((err) => errorExit(err.message));
 }
 

package/templates/base/src/app/components/index.ts.hbs

@@ -1 +0,0 @@
-// global components export

package/templates/base/src/app/services/index.ts.hbs

@@ -1 +0,0 @@
-// global services export

package/templates/base/src/app/views/index.ts.hbs

@@ -1,3 +0,0 @@
-// global views export
-export * from './home/home.view.js';
-export * from './not-found/not-found.view.js';