@deessejs/collections 0.0.42 → 0.0.46

package/dist/config/index.d.ts

@@ -2,4 +2,3 @@ import { Config } from "./types";
 export declare const defineConfig: (config: Config) => import("drizzle-orm/node-postgres").NodePgDatabase<Record<string, never>> & {
     $client: import("pg").Pool;
 };
-export declare const waitConfig: () => Promise<Config>;

package/dist/config/index.js

@@ -1,18 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitConfig = exports.defineConfig = void 0;
+exports.defineConfig = void 0;
+// src/core/index.ts (ou là où est défini defineConfig)
 const node_postgres_1 = require("drizzle-orm/node-postgres");
-let _config;
 const defineConfig = (config) => {
-    _config = config;
     const db = (0, node_postgres_1.drizzle)(config.databaseUrl);
+    // Astuce : on attache la config brute à l'objet retourné.
+    // Cela permet au worker de lire "db._config.collections" plus tard.
+    // On le type en "any" ou on étend le type de retour pour éviter les erreurs TS.
+    db._config = config;
     return db;
 };
 exports.defineConfig = defineConfig;
-const waitConfig = async () => {
-    while (!_config) {
-        await new Promise((r) => setTimeout(r, 50));
-    }
-    return _config;
-};
-exports.waitConfig = waitConfig;

package/dist/next/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withCollections = void 0;
+// src/next/index.ts (votre withCollections)
 const child_process_1 = require("child_process");
 const constants_1 = require("next/constants");
 const path_1 = __importDefault(require("path"));
@@ -11,14 +12,32 @@ const withCollections = (phase, config) => {
     const isDev = phase === constants_1.PHASE_DEVELOPMENT_SERVER;
     if (isDev && !global.__collections_worker_started) {
         global.__collections_worker_started = true;
-        const workerPath = path_1.default.join(__dirname, "../worker/index.js");
-        console.log("[withCollections] Spawning background worker:", workerPath);
+        // Attention : Assurez-vous que ce chemin pointe vers le fichier JS compilé de votre lib
+        // Si vous êtes en monorepo/dev local sur la lib, pointez vers le TS avec ts-node ou bun
+        const workerPath = path_1.default.resolve(__dirname, "../worker/index.js");
+        console.log("[Deesse] Spawning background worker:", workerPath);
         (0, child_process_1.spawn)("node", [workerPath], {
             stdio: "inherit",
+            env: {
+                ...process.env,
+                // Variables d'env utiles pour le worker
+                NODE_ENV: "development",
+            }
         });
     }
+    // On ajoute un alias webpack pour que l'utilisateur puisse importer
+    // le schéma généré facilement s'il en a besoin, 
+    // ou pour que Drizzle trouve le fichier généré.
     return {
         ...config,
+        webpack: (webpackConfig, options) => {
+            if (config.webpack) {
+                webpackConfig = config.webpack(webpackConfig, options);
+            }
+            // Exemple : alias pour accéder au dossier shadow facilement
+            webpackConfig.resolve.alias["@deesse/schema"] = path_1.default.join(process.cwd(), ".deesse/shadow/schema");
+            return webpackConfig;
+        }
     };
 };
 exports.withCollections = withCollections;

package/dist/worker/index.d.ts

@@ -1,2 +1 @@
-import { Collection } from "../collections/types";
-export declare const loadCollections: () => Promise<Collection[]>;
+export {};

package/dist/worker/index.js

@@ -1,72 +1,54 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadCollections = void 0;
-const fs_1 = __importDefault(require("fs"));
+// src/worker/index.ts
+const jiti_1 = require("jiti");
 const path_1 = __importDefault(require("path"));
-const generate_1 = require("../drizzle/generate");
-// Dossier des collections
-const collectionsDir = path_1.default.join(process.cwd(), "src", "collections");
-console.log(`[worker] Loading collections from ${collectionsDir}`);
-// Fonction pour importer toutes les collections
-const loadCollections = async () => {
-    const files = fs_1.default
-        .readdirSync(collectionsDir)
-        .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
-    const collections = [];
-    for (const file of files) {
-        const fullPath = path_1.default.join(collectionsDir, file);
-        // Utilisation de import dynamique
-        const module = await Promise.resolve(`${fullPath}`).then(s => __importStar(require(s)));
-        // On suppose que la collection exporte toujours une const (ex: Posts)
-        for (const exported of Object.values(module)) {
-            const col = exported;
-            if (col?.slug && col?.fields) {
-                collections.push(col);
-            }
+const chokidar_1 = __importDefault(require("chokidar"));
+const generate_1 = require("../drizzle/generate"); // Votre fonction de génération existante
+const PROJECT_ROOT = process.cwd();
+const CONFIG_PATH = path_1.default.join(PROJECT_ROOT, "src", "api", "index.ts");
+const COLLECTIONS_DIR = path_1.default.join(PROJECT_ROOT, "src", "collections");
+// Initialiser Jiti pour lire du TS directement
+const jiti = (0, jiti_1.createJiti)(PROJECT_ROOT, {
+    interopDefault: true,
+    requireCache: false, // Important pour recharger quand le fichier change
+});
+async function runGenerator() {
+    try {
+        console.log("[Deesse] 🛠️  Generating schema...");
+        // 1. On vide le cache de jiti pour être sûr d'avoir la dernière version
+        // jiti gère le cache automatiquement mais on peut forcer si besoin selon la version
+        // 2. On charge le fichier de config utilisateur
+        // Jiti va compiler le TS à la volée.
+        const mod = await jiti.import(CONFIG_PATH);
+        // 3. On récupère la config
+        // Note : Si l'utilisateur fait "export const db = ...", mod.db sera l'instance
+        // Si l'utilisateur fait "export default ...", ce sera mod.default
+        const dbInstance = mod.db || mod.default;
+        if (!dbInstance || !dbInstance._config) {
+            throw new Error("[Deesse] Could not find exported 'db' or '_config' in src/api/index.ts");
         }
+        const collections = dbInstance._config.collections;
+        // 4. On appelle votre fonction existante
+        (0, generate_1.generateShadowSchema)(collections);
+        console.log("[Deesse] ✅ Schema updated");
     }
-    return collections;
-};
-exports.loadCollections = loadCollections;
-// Exemple d'utilisation
-(async () => {
-    const collections = await (0, exports.loadCollections)();
-    (0, generate_1.generateShadowSchema)(collections);
-    console.log(`[worker] Shadow schema generated for ${collections.length} collections.`);
-})();
+    catch (error) {
+        console.error("[Deesse] ❌ Error generating schema:", error);
+    }
+}
+// Lancement initial
+runGenerator();
+// Mode Watch
+console.log(`[Deesse] 👀 Watching for changes in ${COLLECTIONS_DIR}...`);
+const watcher = chokidar_1.default.watch([CONFIG_PATH, COLLECTIONS_DIR], {
+    ignoreInitial: true,
+    ignored: /(^|[\/\\])\../, // Ignorer les fichiers cachés (dotfiles)
+});
+watcher.on("all", (event, path) => {
+    // On debounce légèrement pour éviter de générer 2 fois si l'éditeur sauvegarde en plusieurs étapes
+    runGenerator();
+});

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@deessejs/collections",
-  "version": "0.0.42",
+  "version": "0.0.46",
   "description": "",
-  "types": "dist/index.d.ts",
   "main": "dist/index.js",
-  "module": "dist/esm/index.js",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.esm.js",
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
+      "import": "./dist/index.esm.js",
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
@@ -18,6 +18,7 @@
     "LICENSE"
   ],
   "scripts": {
+    "build": "tsc",
     "build:watch": "tsc --watch",
     "prepublishOnly": "npm run build",
     "lint": "eslint src --ext .ts",
@@ -26,10 +27,7 @@
     "test:ui": "vitest --ui",
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "test:watch": "vitest watch",
-    "build:cjs": "tsc --project tsconfig.json",
-    "build:esm": "tsc --project tsconfig.esm.json",
-    "build": "npm run build:cjs && npm run build:esm"
+    "test:watch": "vitest watch"
   },
   "repository": {
     "type": "git",
@@ -68,6 +66,7 @@
     "chokidar": "^5.0.0",
     "dotenv": "^17.2.3",
     "drizzle-orm": "^0.45.0",
+    "jiti": "^2.6.1",
     "pg": "^8.16.3"
   }
 }