@appweaver/create-weaver-app 1.0.21 → 1.0.23

package/create-weaver-app.js

@@ -89,6 +89,8 @@ program
             await promises_1.default.rm(node_path_1.default.join(destDir, dockerFile), { force: true });
         }
     }
+    // Build database-specific docker-compose service blocks
+    const dockerDb = getDatabaseDockerConfig(command, sanitizedName);
     // Define all variables used in template files with .tpl extension
     const variables = {
         NAME: name.charAt(0).toUpperCase() + name.slice(1),
@@ -99,6 +101,11 @@ program
         DEPENDENCIES: getNodeDependencies(command, runtime).join(',\n'),
         DATABASE_URL: getDatabaseUrl(command, sanitizedName, 'dev'),
         DATABASE_TEST_URL: getDatabaseUrl(command, sanitizedName, 'test'),
+        DATABASE_DOCKER_SERVICE: dockerDb.service,
+        DATABASE_DOCKER_MIGRATE_DEPENDS: dockerDb.migrateDepends,
+        DATABASE_DOCKER_SQLITE_VOLUMES: dockerDb.sqliteVolumes,
+        DATABASE_DOCKER_APP_VOLUME: dockerDb.appVolume,
+        DATABASE_DOCKER_NAMED_VOLUME: dockerDb.namedVolume,
         VERSION: pkg.version
     };
     // Process .tpl files: replace variables and remove .tpl extension
@@ -133,6 +140,10 @@ program
     }
     // Create test reports directory
     await promises_1.default.mkdir(node_path_1.default.join(destDir, 'reports'));
+    // Create the SQLite database data directory (matches the "data/" DATABASE_URL)
+    if (command.getOptionValue('database') === 'sqlite') {
+        await promises_1.default.mkdir(node_path_1.default.join(destDir, 'data'), { recursive: true });
+    }
     // Add instructions for AI Agents and skill files
     const agent = command.getOptionValue('agent');
     if (agent !== 'none') {
@@ -218,7 +229,7 @@ function getNodeDependencies(command, runtime) {
 function getDatabaseUrl(command, name, mode) {
     const dbName = mode === 'test' ? `${name}-test` : name;
     const urls = {
-        sqlite: `file:./${mode === 'test' ? 'temp/' : ''}${dbName}.db`,
+        sqlite: `file:./${mode === 'test' ? 'temp/' : 'data/'}${dbName}.db`,
         postgresql: `postgresql://${name}:${name}@localhost:5432/${dbName}?schema=public`,
         mysql: `mysql://${name}:${name}@localhost:3306/${dbName}`,
         sqlserver: `sqlserver://localhost:1433;database=${dbName};user=${name};password=${name};trustServerCertificate=true`
@@ -231,6 +242,116 @@ function getDatabaseUrl(command, name, mode) {
     }
     return databaseUrl;
 }
+function getDatabaseDockerConfig(command, name) {
+    const database = command.getOptionValue('database').toLowerCase();
+    // SQLite runs embedded in the application, so there is no database service.
+    // The database file is persisted in a named volume shared by the migration,
+    // seed, and application containers (see the "data/" DATABASE_URL location).
+    if (database === 'sqlite') {
+        return {
+            service: '',
+            migrateDepends: '',
+            sqliteVolumes: `    volumes:\n      - sqlite-data:/usr/app/data\n`,
+            appVolume: `\n      - sqlite-data:/usr/app/data`,
+            namedVolume: `  sqlite-data:\n`
+        };
+    }
+    const services = {
+        postgresql: {
+            service: `  postgres:
+    image: postgres:18.4
+    container_name: ${name}-postgres
+    restart: unless-stopped
+    healthcheck:
+      test: "PGPASSWORD=$$POSTGRES_PASSWORD psql -U $$POSTGRES_USER -d $$POSTGRES_DB -c 'SELECT 1'"
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5s
+      start_interval: 5s
+    ports:
+      - "127.0.0.1:5433:5432"
+    environment:
+      POSTGRES_DB: "\${DB_NAME}"
+      POSTGRES_USER: "\${DB_USER}"
+      POSTGRES_PASSWORD: "\${DB_PASSWORD}"
+    volumes:
+      - postgres-data:/var/lib/postgresql
+    networks:
+      - ${name}
+
+`,
+            volume: `  postgres-data:\n`
+        },
+        mysql: {
+            service: `  mysql:
+    image: mysql:8.4
+    container_name: ${name}-mysql
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-u", "root", "-p$$MYSQL_ROOT_PASSWORD" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5s
+      start_interval: 5s
+    ports:
+      - "127.0.0.1:3307:3306"
+    environment:
+      MYSQL_DATABASE: "\${DB_NAME}"
+      MYSQL_USER: "\${DB_USER}"
+      MYSQL_PASSWORD: "\${DB_PASSWORD}"
+      MYSQL_ROOT_PASSWORD: "\${DB_PASSWORD}"
+    volumes:
+      - mysql-data:/var/lib/mysql
+    networks:
+      - ${name}
+
+`,
+            volume: `  mysql-data:\n`
+        },
+        sqlserver: {
+            service: `  sqlserver:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    container_name: ${name}-sqlserver
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P \\"$$MSSQL_SA_PASSWORD\\" -C -Q 'SELECT 1' || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 10s
+      start_interval: 5s
+    ports:
+      - "127.0.0.1:1434:1433"
+    environment:
+      ACCEPT_EULA: "Y"
+      MSSQL_SA_PASSWORD: "\${DB_PASSWORD}"
+    volumes:
+      - sqlserver-data:/var/opt/mssql
+    networks:
+      - ${name}
+
+`,
+            volume: `  sqlserver-data:\n`
+        }
+    };
+    const config = services[database];
+    if (!config) {
+        console.error(`Invalid database type: ${database}`);
+        process.exit(1);
+    }
+    return {
+        service: config.service,
+        migrateDepends: `    depends_on:
+      ${database === 'postgresql' ? 'postgres' : database}:
+        condition: service_healthy
+`,
+        sqliteVolumes: '',
+        appVolume: '',
+        namedVolume: config.volume
+    };
+}
 function runProcess(cmd, args = [], params = {}) {
     return new Promise((resolve, reject) => {
         const { destDir, quiet } = params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appweaver/create-weaver-app",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Appweaver - the backend framework for AI-first development (@create-weaver-app)",
   "author": "Luka Matosevic",
   "license": "MIT",

package/skill/GUIDELINES.md

@@ -18,7 +18,7 @@ provides factory methods for creating resource models, services, policies, and r
 - `appweaver.json` / `appweaver.{env}.json` - central configuration
 - `Dockerfile` - Docker image definition
 
-**IMPORTANT:** `{env}` is controlled by `NODE_ENV` evironment variable.
+**IMPORTANT:** `{env}` is controlled by `NODE_ENV` environment variable.
 
 ## Application entrypoint
 

package/skill/references/client.md

@@ -44,6 +44,7 @@ Reads an OpenAPI v3 schema and generates TypeScript types and a typed client cla
 | `--typesPath [path]`  | Output path for generated TypeScript types only                                            | same as `outputPath`      |
 | `--clientPath [path]` | Output path for generated client class only                                                | same as `outputPath`      |
 | `--clientName [name]` | Custom name for the generated client class                                                 | derived from schema title |
+| `--framework [name]`  | Framework for the generated client class (`fetch` or `angular`)                            | `fetch`                   |
 | `--typesOnly`         | Generate TypeScript types only, skip client class generation                               | `false`                   |
 | `--clientOnly`        | Generate client class only, skip TypeScript types generation                               | `false`                   |
 | `--noTypes`           | Generate client class without TypeScript type support                                      | `false`                   |
@@ -158,6 +159,27 @@ The generated second type argument to `resourceClient` (e.g., `['aggregate', 'ex
 removes those methods from the returned `ResourceClient` at the TypeScript level, preventing accidental calls to
 operations not exposed by the API.
 
+### Angular client (`--framework angular`)
+
+Passing `--framework angular` generates a client class extending `AngularClient` instead of `FetchClient`. The
+generated class is constructed with Angular's `HttpClient` and all its methods return RxJS `Observable`s instead of
+`Promise`s:
+
+```ts
+import { ClientConfig, ClientError } from '@appweaver/client';
+import { AngularClient } from '@appweaver/client/angular';
+import { HttpClient } from '@angular/common/http';
+
+// In an Angular service or provider:
+const client = new CMSAPIClient(httpClient, { baseUrl: 'http://localhost:3000' });
+client.user.query({ filter: { enabled: true } }).subscribe((users) => {});
+```
+
+**Important:** `AngularClient` is only available from the `@appweaver/client/angular` subpath — it is not exported from
+the main `@appweaver/client` entry point. This keeps `rxjs` completely out of the module graph (runtime and types) for
+`FetchClient` users. `rxjs` is an **optional peer dependency**: Angular projects already have it installed, while
+fetch-only projects do not need it at all.
+
 ---
 
 ## Runtime library

package/templates/default/Dockerfile

@@ -29,7 +29,7 @@ WORKDIR /usr/app
 # Copy NPM package
 COPY --from=build /usr/app/package*.json /usr/app/
 
-# Install NPM dependencies for production
+# Install production NPM dependencies
 RUN npm ci --omit=dev
 
 # Copy build files
@@ -52,8 +52,8 @@ COPY --from=build /usr/app/start.sh /usr/app/start.sh
 # Make start script executable
 RUN chmod +x /usr/app/start.sh
 
-# Create storage and logs directories
-RUN mkdir storage logs
+# Create storage, logs, and data directories
+RUN mkdir storage logs data
 
 # Start container
 ENTRYPOINT ["/usr/app/start.sh"]

package/templates/default/Dockerfile.bun

@@ -52,8 +52,8 @@ COPY --from=build /usr/app/start.sh /usr/app/start.sh
 # Make start script executable
 RUN chmod +x /usr/app/start.sh
 
-# Create storage and logs directories
-RUN mkdir storage logs
+# Create storage, logs, and data directories
+RUN mkdir storage logs data
 
 # Start container
 ENTRYPOINT ["/usr/app/start.sh"]

package/templates/default/docker-compose.yml.tpl

@@ -1,107 +1,81 @@
-services:
-  postgres:
-    image: postgres:18.4
-    container_name: {{LOWER_NAME}}-postgres
-    restart: unless-stopped
-    healthcheck:
-      test: "PGPASSWORD=$$POSTGRES_PASSWORD psql -U $$POSTGRES_USER -d $$POSTGRES_DB -c 'SELECT 1'"
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 5s
-      start_interval: 5s
-    ports:
-      - "127.0.0.1:5433:5432"
-    environment:
-      POSTGRES_DB: "${DB_NAME}"
-      POSTGRES_USER: "${DB_USER}"
-      POSTGRES_PASSWORD: "${DB_PASSWORD}"
-    volumes:
-      - postgres-data:/var/lib/postgresql
-    networks:
-      - {{LOWER_NAME}}
-
-  redis:
-    image: redis:7.4.9
-    container_name: {{LOWER_NAME}}-redis
-    restart: unless-stopped
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 5s
-      start_interval: 5s
-    ports:
-      - "127.0.0.1:6378:6379"
-    volumes:
-      - redis-data:/data
-    networks:
-      - {{LOWER_NAME}}
-
-  {{LOWER_NAME}}.migrations:
-    image: {{LOWER_NAME}}:latest
-    container_name: {{LOWER_NAME}}-migrations
-    restart: no
-    build:
-      context: .
-    depends_on:
-      postgres:
-        condition: service_healthy
-    env_file:
-      - .env
-    command: [ "migrations" ]
-    networks:
-      - {{LOWER_NAME}}
-
-  {{LOWER_NAME}}.seed:
-    image: {{LOWER_NAME}}:latest
-    container_name: {{LOWER_NAME}}-seed
-    restart: no
-    build:
-      context: .
-    depends_on:
-      {{LOWER_NAME}}.migrations:
-        condition: service_completed_successfully
-    env_file:
-      - .env
-    command: [ "seed" ]
-    networks:
-      - {{LOWER_NAME}}
-
-  {{LOWER_NAME}}:
-    image: {{LOWER_NAME}}:latest
-    container_name: {{LOWER_NAME}}
-    restart: unless-stopped
-    build:
-      context: .
-    healthcheck:
-      test: "wget -qO - http://127.0.0.1:{{PORT}}/health/ready || exit 1"
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
-      start_interval: 5s
-    depends_on:
-      redis:
-        condition: service_healthy
-      {{LOWER_NAME}}.seed:
-        condition: service_completed_successfully
-    ports:
-      - "127.0.0.1:{{PORT}}:{{PORT}}"
-    volumes:
-      - ./storage:/usr/app/storage
-      - ./logs:/usr/app/logs
-    env_file:
-      - .env
-    networks:
-      - {{LOWER_NAME}}
-
-networks:
-  {{LOWER_NAME}}:
-    driver: bridge
-    name: {{LOWER_NAME}}-network
-
-volumes:
-  postgres-data:
-  redis-data:
+services:
+{{DATABASE_DOCKER_SERVICE}}  redis:
+    image: redis:7.4.9
+    container_name: {{LOWER_NAME}}-redis
+    restart: unless-stopped
+    healthcheck:
+      test: [ "CMD", "redis-cli", "ping" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5s
+      start_interval: 5s
+    ports:
+      - "127.0.0.1:6378:6379"
+    volumes:
+      - redis-data:/data
+    networks:
+      - {{LOWER_NAME}}
+
+  {{LOWER_NAME}}.migrations:
+    image: {{LOWER_NAME}}:latest
+    container_name: {{LOWER_NAME}}-migrations
+    restart: no
+    build:
+      context: .
+{{DATABASE_DOCKER_MIGRATE_DEPENDS}}    env_file:
+      - .env
+    command: [ "migrations" ]
+{{DATABASE_DOCKER_SQLITE_VOLUMES}}    networks:
+      - {{LOWER_NAME}}
+
+  {{LOWER_NAME}}.seed:
+    image: {{LOWER_NAME}}:latest
+    container_name: {{LOWER_NAME}}-seed
+    restart: no
+    build:
+      context: .
+    depends_on:
+      {{LOWER_NAME}}.migrations:
+        condition: service_completed_successfully
+    env_file:
+      - .env
+    command: [ "seed" ]
+{{DATABASE_DOCKER_SQLITE_VOLUMES}}    networks:
+      - {{LOWER_NAME}}
+
+  {{LOWER_NAME}}:
+    image: {{LOWER_NAME}}:latest
+    container_name: {{LOWER_NAME}}
+    restart: unless-stopped
+    build:
+      context: .
+    healthcheck:
+      test: "wget -qO - http://127.0.0.1:{{PORT}}/health/ready || exit 1"
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 5s
+      start_interval: 5s
+    depends_on:
+      redis:
+        condition: service_healthy
+      {{LOWER_NAME}}.seed:
+        condition: service_completed_successfully
+    ports:
+      - "127.0.0.1:{{PORT}}:{{PORT}}"
+    volumes:
+      - ./storage:/usr/app/storage
+      - ./logs:/usr/app/logs{{DATABASE_DOCKER_APP_VOLUME}}
+    env_file:
+      - .env
+    networks:
+      - {{LOWER_NAME}}
+
+networks:
+  {{LOWER_NAME}}:
+    driver: bridge
+    name: {{LOWER_NAME}}-network
+
+volumes:
+{{DATABASE_DOCKER_NAMED_VOLUME}}  redis-data:

package/templates/default/package.json.bun.tpl

@@ -1,39 +1,39 @@
-{
-  "name": "{{LOWER_NAME}}",
-  "version": "1.0.0",
-  "description": "{{DESCRIPTION}}",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "build": "weaver build",
-    "start": "weaver start",
-    "dev": "weaver start --watch",
-    "generate": "weaver generate",
-    "migrate": "weaver migrate",
-    "seed": "weaver seed",
-    "test": "bun test ./test/unit --coverage ./src/**/*.ts --reporter=junit --reporter-outfile=./reports/junit.xml",
-    "e2e": "bun test ./test/e2e --reporter=junit --reporter-outfile=./reports/e2e.xml --preload ./test/e2e/support/preload.ts",
-    "format": "prettier --write \"./**/*.ts\"",
-    "lint": "eslint \"./**/*.ts\""
-  },
-  "dependencies": {
-    "@appweaver/cli": "{{VERSION}}",
-    "@appweaver/common": "{{VERSION}}",
-    "@appweaver/core": "{{VERSION}}",
-{{DEPENDENCIES}}
-  },
-  "devDependencies": {
-    "@eslint/js": "9.39.2",
-    "@types/bun": "1.3.14",
-    "@types/node": "26.0.0",
-    "@typescript-eslint/eslint-plugin": "8.61.1",
-    "@typescript-eslint/parser": "8.61.1",
-    "eslint": "9.39.2",
-    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-prettier": "5.5.6",
-    "globals": "17.6.0",
-    "prettier": "3.8.4",
-    "typescript": "5.9.3",
-    "typescript-eslint": "8.61.1"
-  }
-}
+{
+  "name": "{{LOWER_NAME}}",
+  "version": "1.0.0",
+  "description": "{{DESCRIPTION}}",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "build": "weaver build",
+    "start": "weaver start",
+    "dev": "weaver start --watch",
+    "generate": "weaver generate",
+    "migrate": "weaver migrate",
+    "seed": "weaver seed",
+    "test": "bun test ./test/unit --coverage ./src/**/*.ts --reporter=junit --reporter-outfile=./reports/junit.xml",
+    "e2e": "bun test ./test/e2e --reporter=junit --reporter-outfile=./reports/e2e.xml --preload ./test/e2e/support/preload.ts",
+    "format": "prettier --write \"./**/*.ts\"",
+    "lint": "eslint \"./**/*.ts\""
+  },
+  "dependencies": {
+    "@appweaver/cli": "{{VERSION}}",
+    "@appweaver/common": "{{VERSION}}",
+    "@appweaver/core": "{{VERSION}}",
+{{DEPENDENCIES}}
+  },
+  "devDependencies": {
+    "@eslint/js": "9.39.2",
+    "@types/bun": "1.3.14",
+    "@types/node": "26.0.0",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "eslint": "9.39.2",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-prettier": "5.5.6",
+    "globals": "17.6.0",
+    "prettier": "3.8.4",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.61.1"
+  }
+}

package/templates/default/package.json.tpl

@@ -1,44 +1,44 @@
-{
-  "name": "{{LOWER_NAME}}",
-  "version": "1.0.0",
-  "description": "{{DESCRIPTION}}",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "build": "weaver build",
-    "start": "weaver start",
-    "dev": "weaver start --watch",
-    "generate": "weaver generate",
-    "migrate": "weaver migrate",
-    "seed": "weaver seed --buildProject",
-    "test": "jest --forceExit --detectOpenHandles --coverage",
-    "e2e": "jest --forceExit --detectOpenHandles --config ./test/e2e/jest.e2e-config.json",
-    "format": "prettier --write \"./**/*.ts\"",
-    "lint": "eslint \"./**/*.ts\""
-  },
-  "dependencies": {
-    "@appweaver/cli": "{{VERSION}}",
-    "@appweaver/common": "{{VERSION}}",
-    "@appweaver/core": "{{VERSION}}",
-{{DEPENDENCIES}}
-  },
-  "devDependencies": {
-    "@eslint/js": "9.39.2",
-    "@swc/core": "1.15.41",
-    "@swc/jest": "0.2.39",
-    "@types/jest": "30.0.0",
-    "@types/node": "26.0.0",
-    "@typescript-eslint/eslint-plugin": "8.61.1",
-    "@typescript-eslint/parser": "8.61.1",
-    "eslint": "9.39.2",
-    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-jest": "29.15.2",
-    "eslint-plugin-prettier": "5.5.6",
-    "globals": "17.6.0",
-    "jest": "30.4.2",
-    "jest-junit": "17.0.0",
-    "prettier": "3.8.4",
-    "typescript": "5.9.3",
-    "typescript-eslint": "8.61.1"
-  }
-}
+{
+  "name": "{{LOWER_NAME}}",
+  "version": "1.0.0",
+  "description": "{{DESCRIPTION}}",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "build": "weaver build",
+    "start": "weaver start",
+    "dev": "weaver start --watch",
+    "generate": "weaver generate",
+    "migrate": "weaver migrate",
+    "seed": "weaver seed --buildProject",
+    "test": "jest --forceExit --detectOpenHandles --coverage",
+    "e2e": "jest --forceExit --detectOpenHandles --config ./test/e2e/jest.e2e-config.json",
+    "format": "prettier --write \"./**/*.ts\"",
+    "lint": "eslint \"./**/*.ts\""
+  },
+  "dependencies": {
+    "@appweaver/cli": "{{VERSION}}",
+    "@appweaver/common": "{{VERSION}}",
+    "@appweaver/core": "{{VERSION}}",
+{{DEPENDENCIES}}
+  },
+  "devDependencies": {
+    "@eslint/js": "9.39.2",
+    "@swc/core": "1.15.41",
+    "@swc/jest": "0.2.39",
+    "@types/jest": "30.0.0",
+    "@types/node": "26.0.0",
+    "@typescript-eslint/eslint-plugin": "8.61.1",
+    "@typescript-eslint/parser": "8.61.1",
+    "eslint": "9.39.2",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-jest": "29.15.2",
+    "eslint-plugin-prettier": "5.5.6",
+    "globals": "17.6.0",
+    "jest": "30.4.2",
+    "jest-junit": "17.0.0",
+    "prettier": "3.8.4",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.61.1"
+  }
+}