create-warlock 4.0.30 → 4.0.39

package/templates/warlock/src/config/database.ts

@@ -1,16 +1,33 @@
 import { env } from "@mongez/dotenv";
-import type { DatabaseConfigurations } from "@warlock.js/cascade";
+import type {
+  ConnectionOptions,
+  MongoClientOptions,
+  MongoDriverOptions,
+} from "@warlock.js/cascade";
 
-const databaseConfigurations: DatabaseConfigurations = {
+const databaseConfigurations: ConnectionOptions<MongoDriverOptions, MongoClientOptions> = {
+  driver: "mongodb",
+  name: "default",
+  database: env("DB_NAME"),
   host: env("DB_HOST", "localhost"),
   port: env("DB_PORT", 27017),
   username: env("DB_USERNAME"),
   password: env("DB_PASSWORD"),
-  database: env("DB_NAME"),
-  dbAuth: env("DB_AUTH"),
-  url: env("DB_URL"),
-  replicaSet: env("DB_REPLICA_SET"),
-  model: {
+  authSource: env("DB_AUTH"),
+  uri: env("DB_URL"),
+
+  driverOptions: {
+    autoGenerateId: true,
+    counterCollection: "counters",
+  },
+
+  defaultDeleteStrategy: "trash",
+
+  clientOptions: {
+    replicaSet: env("DB_REPLICA_SET"),
+  },
+
+  modelOptions: {
     randomIncrement: true,
     initialId: 1,
   },

package/templates/warlock/src/config/storage.ts

@@ -1,20 +1,29 @@
 import { env } from "@mongez/dotenv";
-import { type StorageConfigurations, uploadsPath } from "@warlock.js/core";
+import { type StorageConfigurations, storageConfigurations, uploadsPath } from "@warlock.js/core";
 
 const storageOptions: StorageConfigurations = {
-  default: "rafaat",
+  default: "local",
   drivers: {
-    rafaat: {
-      driver: "local",
+    local: storageConfigurations.local({
       root: uploadsPath(),
-    },
-    aws: {
-      driver: "s3",
+      urlPrefix: "/uploads",
+    }),
+    aws: storageConfigurations.aws({
       accessKeyId: env("AWS_ACCESS_KEY_ID"),
       secretAccessKey: env("AWS_SECRET_ACCESS_KEY"),
       region: env("AWS_REGION"),
       bucket: env("AWS_BUCKET"),
-    },
+    }),
+    r2: storageConfigurations.r2({
+      bucket: env("R2_BUCKET"),
+      endpoint: env("R2_ENDPOINT"),
+      accessKeyId: env("R2_ACCESS_KEY_ID"),
+      secretAccessKey: env("R2_SECRET_ACCESS_KEY"),
+      accountId: env("R2_ACCOUNT_ID"),
+      region: env("R2_REGION", "auto"),
+      publicDomain: env("R2_BASE_URL"),
+      prefix: "warlock.js",
+    }),
   },
 };
 

package/templates/warlock/tsconfig.json

@@ -1,14 +1,16 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "lib": ["esnext"],
-    "allowJs": true,
+    "lib": ["esnext", "dom"],
+    "allowJs": false,
     "skipLibCheck": true,
+    "experimentalDecorators": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "downlevelIteration": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
+    "typeRoots": ["./src/typings.d.ts"],
     "noFallthroughCasesInSwitch": true,
     "module": "ESNext",
     "moduleResolution": "node",
@@ -17,11 +19,10 @@
     "isolatedModules": true,
     "baseUrl": "./",
     "paths": {
-      "app/*": ["src/app/*"],
-      "src/*": ["./src/*"]
+      "app/*": ["src/app/*"]
     },
     "noEmit": true
   },
-  "include": ["src", "warlock.config.ts", ".warlock/**/*.d.ts"],
+  "include": ["src", "warlock.config.ts", ".warlock/typings/*.d.ts"],
   "exclude": ["node_modules"]
 }