@idevconn/create-icore 0.10.1 → 0.11.0

package/dist/index.js

@@ -78,6 +78,7 @@ async function rewriteRootPackageJson(targetDir, opts) {
   const pkg = JSON.parse(raw);
   pkg["name"] = opts.projectName;
   pkg["version"] = "0.0.1";
+  pkg["icoreVersion"] = typeof ICORE_OWN_VERSION !== "undefined" ? ICORE_OWN_VERSION : "unknown";
   pkg["private"] = true;
   delete pkg.description;
   const transportDeps = TRANSPORT_DEPS[opts.transport];
@@ -345,6 +346,7 @@ var AUTH_ONLY_PATHS = [
   "apps/api/src/app/abilities",
   "libs/shared/src/abilities",
   "apps/client/src/components/auth",
+  "apps/client/src/components/AccessDeniedPage.tsx",
   "apps/client/src/routes/login.tsx",
   "apps/client/src/routes/auth.callback.tsx",
   "apps/client/src/routes/auth.oauth.callback.tsx",
@@ -481,6 +483,121 @@ export * from './lib/draft/index.js';
 export * from './lib/landing/LandingPage.js';
 export * from './lib/stores/theme.store.js';
 `;
+var SHADCN_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+interface PageLayoutProps {
+  title: string;
+  description?: string;
+  actions?: ReactNode;
+  children: ReactNode;
+}
+
+export function PageLayout({ title, description, actions, children }: PageLayoutProps) {
+  const { t } = useTranslation();
+  const isLoading = useLoading();
+
+  useDraft(false);
+
+  return (
+    <div className="p-4 md:p-6 space-y-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <h1 className="text-xl font-semibold text-foreground">{title}</h1>
+          {description && <p className="text-sm text-muted-foreground mt-1">{description}</p>}
+        </div>
+        {actions && <div>{actions}</div>}
+      </div>
+
+      {isLoading && (
+        <div
+          role="status"
+          aria-label={t('common.loading')}
+          className="fixed inset-0 z-50 flex items-center justify-center bg-background/60 backdrop-blur-sm"
+        >
+          <div className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+        </div>
+      )}
+
+      {children}
+    </div>
+  );
+}
+`;
+var ANTD_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Descriptions, Spin } from 'antd';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <div style={{ padding: 24 }}>
+      <Descriptions title={title} extra={extra} style={{ marginBottom: 16 }}>
+        {description ? <Descriptions.Item>{description}</Descriptions.Item> : null}
+      </Descriptions>
+      <Spin spinning={loading}>
+        <div>{children}</div>
+      </Spin>
+    </div>
+  );
+}
+`;
+var MUI_PAGE_LAYOUT_TSX = `import type { ReactNode } from 'react';
+import { Box, LinearProgress, Stack, Typography } from '@mui/material';
+import { useDraft, useLoading } from '@icore/template-shared';
+
+export interface PageLayoutProps {
+  title: ReactNode;
+  description?: ReactNode;
+  extra?: ReactNode;
+  children?: ReactNode;
+}
+
+export function PageLayout({ title, description, extra, children }: PageLayoutProps) {
+  useDraft(false);
+  const loading = useLoading();
+
+  return (
+    <Box sx={{ p: 3 }}>
+      <Stack
+        direction="row"
+        justifyContent="space-between"
+        alignItems="flex-start"
+        spacing={2}
+        mb={3}
+      >
+        <Box>
+          <Typography variant="h4" component="h1">
+            {title}
+          </Typography>
+          {description ? (
+            <Typography variant="body2" color="text.secondary" mt={0.5}>
+              {description}
+            </Typography>
+          ) : null}
+        </Box>
+        {extra ? (
+          <Stack direction="row" spacing={1}>
+            {extra}
+          </Stack>
+        ) : null}
+      </Stack>
+      {loading ? <LinearProgress sx={{ mb: 2 }} /> : null}
+      <Box>{children}</Box>
+    </Box>
+  );
+}
+`;
 var SHADCN_MAIN_TSX = `import './globals.css';
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
@@ -581,7 +698,7 @@ export const Route = createFileRoute('/')({
   ),
 });
 `;
-var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+var SHADCN_LAYOUT_HEADER_TSX = `import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const LOCALES: { code: IcoreLocale; label: string }[] = [
@@ -593,7 +710,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -727,7 +844,7 @@ export const Route = createFileRoute('/')({
 });
 `;
 var ANTD_LAYOUT_HEADER_TSX = `import { Button, Layout, Space } from 'antd';
-import { setStoredLocale, type IcoreLocale } from '@icore/template-shared';
+import { setStoredLocale, type IcoreLocale, i18next } from '@icore/template-shared';
 import { ThemeToggle } from '../ThemeToggle';
 
 const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
@@ -741,7 +858,7 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 export function LayoutHeader() {
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18next.changeLanguage(code);
   }
 
   return (
@@ -913,7 +1030,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   return (
@@ -957,19 +1074,22 @@ var UI_VARIANTS = {
     "apps/client/src/main.tsx": SHADCN_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": SHADCN_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": SHADCN_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": SHADCN_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": SHADCN_PAGE_LAYOUT_TSX
   },
   antd: {
     "apps/client/src/main.tsx": ANTD_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": ANTD_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": ANTD_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": ANTD_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": ANTD_PAGE_LAYOUT_TSX
   },
   mui: {
     "apps/client/src/main.tsx": MUI_MAIN_TSX,
     "apps/client/src/routes/_dashboard.tsx": MUI_DASHBOARD_TSX,
     "apps/client/src/routes/index.tsx": MUI_INDEX_TSX,
-    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX
+    "apps/client/src/components/layout/LayoutHeader.tsx": MUI_LAYOUT_HEADER_TSX,
+    "apps/client/src/components/PageLayout.tsx": MUI_PAGE_LAYOUT_TSX
   }
 };
 async function applyAuthNoneVariants(targetDir, ui) {
@@ -1086,6 +1206,16 @@ var MANIFEST = {
       deps: { mongoose: "^9.6.3" },
       tsPaths: { "@icore/db-mongodb": ["libs/db-strategies/mongodb/src/index.ts"] },
       nestModule: { importFrom: "@icore/db-mongodb", symbol: "MongoDbDbModule", into: "notes" }
+    },
+    postgres: {
+      libDirs: ["libs/db-strategies/postgres"],
+      deps: { postgres: "^3" },
+      tsPaths: { "@icore/db-postgres": ["libs/db-strategies/postgres/src/index.ts"] },
+      nestModule: {
+        importFrom: "@icore/db-postgres",
+        symbol: "PostgresDbModule",
+        into: "notes"
+      }
     }
   },
   feature: {
@@ -2084,7 +2214,8 @@ Re-run with @latest to refresh:
     options: [
       { value: "supabase", label: "Supabase Postgres" },
       { value: "firebase", label: "Firestore" },
-      { value: "mongodb", label: "MongoDB" }
+      { value: "mongodb", label: "MongoDB" },
+      { value: "postgres", label: "PostgreSQL (direct, postgres.js)" }
     ],
     initialValue: authProvider
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@idevconn/create-icore",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "Bootstrap a new project from the iCore scaffold (Nx + NestJS + React + Vite + shadcn/Tailwind, swappable auth + storage providers).",
   "license": "Apache-2.0",
   "author": "iDEVconn",

package/templates/apps/templates/client-antd/src/components/layout/LayoutHeader.tsx

@@ -13,13 +13,13 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 ];
 
 export function LayoutHeader() {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const user = useAuthStore((s) => s.user);
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleLogout() {

package/templates/apps/templates/client-mui/src/components/layout/LayoutHeader.tsx

@@ -32,7 +32,7 @@ export function LayoutHeader() {
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleMenuOpen(event: React.MouseEvent<HTMLElement>) {

package/templates/apps/templates/client-shadcn/src/components/layout/LayoutHeader.tsx

@@ -12,14 +12,14 @@ const LOCALES: { code: IcoreLocale; label: string }[] = [
 ];
 
 export function LayoutHeader() {
-  const { t } = useTranslation();
+  const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const user = useAuthStore((s) => s.user);
   const logout = useAuthStore((s) => s.logout);
 
   function handleLocale(code: IcoreLocale) {
     setStoredLocale(code);
-    window.location.reload();
+    void i18n.changeLanguage(code);
   }
 
   function handleLogout() {

package/templates/apps/templates/client-shadcn/src/components/layout/LayoutSider.tsx

@@ -16,7 +16,7 @@ export function LayoutSider() {
 
   return (
     <aside
-      className={`relative flex flex-col border-r border-[--color-border] bg-[--color-card] transition-all duration-200 ${
+      className={`relative flex flex-col border-e border-[--color-border] bg-[--color-card] transition-all duration-200 ${
         collapsed ? 'w-14' : 'w-52'
       }`}
     >
@@ -41,9 +41,13 @@ export function LayoutSider() {
         type="button"
         onClick={() => setCollapsed((c) => !c)}
         aria-label={collapsed ? 'Expand sidebar' : 'Collapse sidebar'}
-        className="absolute -right-3 top-5 z-10 flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-[--color-border] bg-[--color-card] text-[--color-muted-foreground] shadow-sm hover:text-[--color-foreground] transition-colors"
+        className="absolute -end-3 top-5 z-10 flex h-6 w-6 cursor-pointer items-center justify-center rounded-full border border-[--color-border] bg-[--color-card] text-[--color-muted-foreground] shadow-sm hover:text-[--color-foreground] transition-colors"
       >
-        {collapsed ? <ChevronRight size={12} /> : <ChevronLeft size={12} />}
+        {collapsed ? (
+          <ChevronRight size={12} className="rtl:scale-x-[-1]" />
+        ) : (
+          <ChevronLeft size={12} className="rtl:scale-x-[-1]" />
+        )}
       </button>
     </aside>
   );

package/templates/apps/templates/client-shadcn/src/routes/index.tsx

@@ -4,12 +4,12 @@ import { LandingPage } from '@icore/template-shared';
 // All version strings are injected at build time by vite.config.mts
 // (reads root package.json via fs.readFileSync so they stay accurate
 // even when workspace packages are bumped independently).
-const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string | undefined) ?? '0.0.0-dev';
+const ICORE_VERSION = (import.meta.env.VITE_ICORE_VERSION as string | undefined) ?? '0.0.0-dev';
 
 export const Route = createFileRoute('/')({
   component: () => (
     <LandingPage
-      coreVersion={APP_VERSION}
+      coreVersion={ICORE_VERSION}
       uiLibrary="shadcn"
       deps={[
         { name: 'react', version: (import.meta.env.VITE_DEP_REACT as string) ?? '?' },

package/templates/apps/templates/client-shadcn/vite.config.mts

@@ -19,12 +19,26 @@ import {
 const rootPackageJsonPath = new URL('../../../package.json', import.meta.url);
 const rootPackageJson = JSON.parse(fs.readFileSync(rootPackageJsonPath, 'utf-8')) as {
   version: string;
+  icoreVersion?: string;
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+};
+
+const selfPackageJson = JSON.parse(
+  fs.readFileSync(new URL('./package.json', import.meta.url), 'utf-8'),
+) as {
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
 };
 
 function depVersion(name: string): string {
-  return rootPackageJson.dependencies?.[name] ?? rootPackageJson.devDependencies?.[name] ?? '?';
+  return (
+    rootPackageJson.dependencies?.[name] ??
+    rootPackageJson.devDependencies?.[name] ??
+    selfPackageJson.dependencies?.[name] ??
+    selfPackageJson.devDependencies?.[name] ??
+    '?'
+  );
 }
 
 export default defineConfig(() => ({
@@ -37,6 +51,9 @@ export default defineConfig(() => ({
   },
   define: {
     ...commonDefines(rootPackageJson),
+    'import.meta.env.VITE_ICORE_VERSION': JSON.stringify(
+      rootPackageJson.icoreVersion ?? rootPackageJson.version,
+    ),
     'import.meta.env.VITE_DEP_TAILWINDCSS': JSON.stringify(depVersion('tailwindcss')),
   },
   plugins: [

package/templates/docker-compose.yml

@@ -1,4 +1,18 @@
 services:
+  postgres:
+    image: postgres:16-alpine
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER:-icore}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-icore}
+      POSTGRES_DB: ${POSTGRES_DB:-icore}
+    ports:
+      - '5432:5432'
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U icore']
+      interval: 5s
+      retries: 10
+    networks: [icore]
+
   redis:
     image: redis:7-alpine
     healthcheck:

package/templates/libs/db-strategies/postgres/eslint.config.mjs

@@ -0,0 +1,30 @@
+import baseConfig from '../../../eslint.config.mjs';
+
+export default [
+  ...baseConfig,
+  {
+    files: ['**/*.json'],
+    rules: {
+      '@nx/dependency-checks': [
+        'error',
+        {
+          ignoredFiles: [
+            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
+            '{projectRoot}/vitest.config.{js,ts,mjs,mts}',
+          ],
+          ignoredDependencies: [
+            '@icore/shared',
+            'postgres',
+            '@nestjs/common',
+            '@nestjs/config',
+            '@nestjs/testing',
+            'vitest',
+          ],
+        },
+      ],
+    },
+    languageOptions: {
+      parser: await import('jsonc-eslint-parser'),
+    },
+  },
+];

package/templates/libs/db-strategies/postgres/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@icore/db-postgres",
+  "version": "0.0.1",
+  "private": true,
+  "type": "commonjs",
+  "main": "./src/index.js",
+  "types": "./src/index.ts",
+  "dependencies": {
+    "@icore/shared": "*",
+    "@nestjs/common": "^11.1.27",
+    "@nestjs/config": "^4.0.4",
+    "postgres": "^3.4.5",
+    "tslib": "^2.8.1"
+  },
+  "devDependencies": {
+    "@nestjs/testing": "^11.1.27",
+    "vitest": "^4.1.9"
+  }
+}

package/templates/libs/db-strategies/postgres/project.json

@@ -0,0 +1,19 @@
+{
+  "name": "db-postgres",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/db-strategies/postgres/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/db-strategies/postgres",
+        "main": "libs/db-strategies/postgres/src/index.ts",
+        "tsConfig": "libs/db-strategies/postgres/tsconfig.lib.json",
+        "assets": ["libs/db-strategies/postgres/*.md"]
+      }
+    }
+  }
+}

package/templates/libs/db-strategies/postgres/src/index.ts

@@ -0,0 +1,3 @@
+export * from './lib/postgres-db.strategy';
+export * from './lib/testing/mock-postgres';
+export * from './lib/postgres-db.module';

package/templates/libs/db-strategies/postgres/src/lib/__tests__/postgres-db.contract.unit.test.ts

@@ -0,0 +1,4 @@
+import { runDBContract } from '@icore/shared/testing';
+import { createMockPostgresDB } from '../testing/mock-postgres.js';
+
+runDBContract('PostgresDBStrategy', () => createMockPostgresDB());

package/templates/libs/db-strategies/postgres/src/lib/__tests__/postgres-db.module.unit.test.ts

@@ -0,0 +1,37 @@
+import { describe, it, expect } from 'vitest';
+import { Global, Module } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { ConfigService } from '@nestjs/config';
+import { PostgresDbModule, POSTGRES_DB_REQUIRED_ENV } from '../postgres-db.module.js';
+import { PostgresDBStrategy } from '../postgres-db.strategy.js';
+
+let ENV: Record<string, string | undefined> = {};
+
+@Global()
+@Module({
+  providers: [
+    {
+      provide: ConfigService,
+      useValue: {
+        get: (k: string) => ENV[k],
+        getOrThrow: (k: string) => ENV[k],
+      },
+    },
+  ],
+  exports: [ConfigService],
+})
+class StubConfigModule {}
+
+describe('PostgresDbModule', () => {
+  it('declares its required env', () => {
+    expect(POSTGRES_DB_REQUIRED_ENV).toEqual(['POSTGRES_URL']);
+  });
+
+  it('provides a real PostgresDBStrategy under DBStrategy when env present', async () => {
+    ENV = { POSTGRES_URL: 'postgresql://user:pass@localhost:5432/test' };
+    const ref = await Test.createTestingModule({
+      imports: [StubConfigModule, PostgresDbModule.forRoot('.env')],
+    }).compile();
+    expect(ref.get('DBStrategy')).toBeInstanceOf(PostgresDBStrategy);
+  });
+});

package/templates/libs/db-strategies/postgres/src/lib/postgres-db.module.ts

@@ -0,0 +1,33 @@
+import { Module, DynamicModule } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { buildStrategyWithFallback, FakeDBStrategy } from '@icore/shared';
+import type { DBStrategy } from '@icore/shared';
+import { PostgresDBStrategy } from './postgres-db.strategy';
+
+export const POSTGRES_DB_REQUIRED_ENV = ['POSTGRES_URL'];
+
+@Module({})
+export class PostgresDbModule {
+  static forRoot(envPath: string): DynamicModule {
+    return {
+      module: PostgresDbModule,
+      providers: [
+        {
+          provide: 'DBStrategy',
+          useFactory: (cfg: ConfigService): DBStrategy =>
+            buildStrategyWithFallback<DBStrategy>({
+              service: 'notes MS',
+              provider: 'postgres',
+              requiredEnv: POSTGRES_DB_REQUIRED_ENV,
+              cfg,
+              envPath,
+              build: () => new PostgresDBStrategy(cfg.getOrThrow<string>('POSTGRES_URL')),
+              fake: () => new FakeDBStrategy(),
+            }),
+          inject: [ConfigService],
+        },
+      ],
+      exports: ['DBStrategy'],
+    };
+  }
+}