obsidian-plugin-config 1.1.4 → 1.1.6

package/README.md

@@ -1,117 +1,97 @@
 # Obsidian Plugin Config
 
-<!-- Test modification pour vérifier auto-commit -->
-
-🎯 Système d'injection pour plugins Obsidian autonomes.
+🎯 Injection system for standalone Obsidian plugins.
 
 [![NPM Version](https://img.shields.io/npm/v/obsidian-plugin-config)](https://www.npmjs.com/package/obsidian-plugin-config)
 [![License](https://img.shields.io/npm/l/obsidian-plugin-config)](LICENSE)
 
-**Version actuelle : 1.0.6**
+**Current version: 1.1.5**
 
-## Installation Globale
+## Installation
 
 ```bash
 npm install -g obsidian-plugin-config
 ```
 
-## Utilisation
-
-### Injection dans le répertoire courant
+## Update
 
 ```bash
-cd votre-plugin-obsidian
-obsidian-inject
+npm update -g obsidian-plugin-config
 ```
 
-### Injection par chemin
-
-```bash
-obsidian-inject ../mon-plugin
-obsidian-inject "C:\chemin\vers\plugin"
-```
+## Commands
 
-### Vérification (sans injection)
+### For Plugin Config Development
 
 ```bash
-# Vérifier si un plugin est déjà injecté (avec info de version)
-yarn check-plugin ../mon-plugin
-yarn verify-plugin ../mon-plugin  # alias
+# Development
+yarn start                # Install dependencies + update exports
+yarn build                # Build the project
+yarn dev                  # Development build
+yarn real                 # Build to real vault
+
+# Git Operations
+yarn acp                  # Add, commit, push
+yarn bacp                 # Build + add, commit, push
+yarn v                    # Update version
+
+# NPM Publishing
+yarn build-npm            # Build NPM package
+yarn publish-npm          # Publish to NPM
+
+# Help
+yarn help                 # Show help
 ```
 
-### Aide
+### For Plugin Injection
 
 ```bash
-obsidian-inject --help
-```
-
-## Ce qui est injecté
-
-- ✅ **Scripts locaux autonomes** : `esbuild.config.ts`, `acp.ts`, `update-version.ts`, `utils.ts`, `help.ts`, `release.ts`
-- ✅ **Configuration package.json** : scripts, dépendances, protection yarn obligatoire, `"type": "module"` pour ESM
-- ✅ **Template tsconfig.json** : configuration TypeScript moderne optimisée
-- ✅ **Installation automatique** des dépendances avec yarn
-- ✅ **Analyse des imports centralisés** avec avertissements
-- ✅ **Fichier de traçabilité** : `.injection-info.json` (version, date d'injection)
-
-## 📋 Suivi des versions d'injection
-
-Le système crée un fichier `.injection-info.json` dans chaque plugin injecté pour tracer :
-
-- **Version de l'injecteur** utilisée
-- **Date d'injection**
-- **Nom de l'injecteur** (`obsidian-plugin-config`)
-
-> ⚠️ **Important** : Le fichier `.injection-info.json` est **commité avec le plugin** pour assurer la traçabilité sur GitHub et permettre de voir facilement qu'un plugin a été injecté et avec quelle version.
-
-### Statuts possibles lors de la vérification
-
-- ✅ **Plugin injecté** : Affiche version, date et détecte les mises à jour disponibles
-- ⚠️ **Plugin injecté (legacy)** : Injecté avec l'ancien système, re-injection recommandée
-- ❌ **Plugin non injecté** : Aucune injection détectée
-
-## ⚠️ Configuration ESM Moderne
-
-Le système utilise une configuration TypeScript moderne avec ESM. Si votre plugin a des imports relatifs, vous devrez peut-être les corriger :
+# Interactive injection (recommended)
+obsidian-inject
+obsidian-inject ../my-plugin
+yarn inject-prompt "../my-plugin"
 
-```typescript
-// ❌ Ancien format
-import { helper } from "./MyHelper";
+# Automatic injection
+obsidian-inject ../my-plugin --yes
+yarn inject-path ../my-plugin --yes
 
-// ✅ Format ESM requis
-import { helper } from "./MyHelper.js";
+# Verification only
+yarn check-plugin ../my-plugin
 ```
 
-Cette correction est nécessaire une seule fois après l'injection.
+## What is injected
+
+- ✅ **Standalone local scripts**: `esbuild.config.ts`, `acp.ts`, `update-version.ts`, etc.
+- ✅ **package.json configuration**: scripts, dependencies, yarn protection
+- ✅ **tsconfig.json template**: modern optimized TypeScript configuration
+- ✅ **Automatic installation** of dependencies with yarn
+- ✅ **Traceability file**: `.injection-info.json` (version, injection date)
 
-## Commandes disponibles après injection
+## Commands available after injection
 
 ```bash
-yarn build          # Build production
-yarn dev            # Build développement + watch
-yarn start          # Alias pour dev
-yarn real           # Build vers vault réel (nécessite REAL_VAULT)
+yarn build          # Production build
+yarn dev            # Development build + watch
+yarn start          # Install dependencies + start dev
+yarn real           # Build to real vault
 yarn acp            # Add-commit-push
 yarn bacp           # Build + add-commit-push
-yarn update-version # Mise à jour version + commit + push
-yarn v              # Alias pour update-version
-yarn release        # Release GitHub
-yarn r              # Alias pour release
-yarn help           # Aide complète
-yarn h              # Alias pour help
+yarn v              # Update version
+yarn release        # GitHub release
+yarn help           # Full help
 ```
 
 ## Architecture
 
-Le plugin devient **100% AUTONOME** après injection :
+The plugin becomes **100% STANDALONE** after injection:
 
-- ❌ **Aucune dépendance externe** requise
-- ✅ **Scripts intégrés localement**
-- ✅ **Mise à jour possible** via re-injection
-- ✅ **Protection yarn** maintenue
-- ✅ **Compatible avec tous les plugins Obsidian**
+- ❌ **No external dependencies** required
+- ✅ **Scripts integrated locally**
+- ✅ **Updatable** via re-injection
+- ✅ **Yarn protection** maintained
+- ✅ **Compatible with all Obsidian plugins**
 
-## Développement Local (pour contributeurs)
+## Local Development (for contributors)
 
 ### Installation
 
@@ -121,37 +101,37 @@ cd obsidian-plugin-config
 yarn install
 ```
 
-### Test injection locale
+### Local injection test
 
 ```bash
-# Injection automatique
-yarn inject ../mon-plugin --yes
+# Automatic injection
+yarn inject ../my-plugin --yes
 
-# Injection avec prompts
-yarn inject-prompt "../mon-plugin"
+# Injection with prompts
+yarn inject-prompt "../my-plugin"
 ```
 
-### Workflow complet : Local → NPM
+### Full workflow: Local → NPM
 
 ```bash
-# 1. Développement local
+# 1. Local development
 yarn inject ../test-plugin --yes
 
-# 2. Corriger imports ESM si nécessaire
-# Exemple: "./utils.ts" → "./utils.js"
+# 2. Fix ESM imports if necessary
+# Example: "./utils.ts" → "./utils.js"
 
-# 3. Build et publication NPM
+# 3. Build and publish to NPM
 yarn build-npm
 yarn update-version
 npm login
 npm publish
 ```
 
-### Commandes de maintenance
+### Maintenance commands
 
 ```bash
 yarn acp                # Add, commit, push
-yarn update-version     # Mise à jour version
-yarn build-npm         # Build package NPM
-yarn help              # Aide complète
+yarn update-version     # Update version
+yarn build-npm         # Build NPM package
+yarn help              # Full help
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-config",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Système d'injection pour plugins Obsidian autonomes",
   "type": "module",
   "main": "src/index.ts",
@@ -20,26 +20,25 @@
   ],
   "scripts": {
     "start": "yarn install && yarn run update-exports",
+    "i": "yarn install && yarn run update-exports",
     "update-exports": "node scripts/update-exports.js",
+    "ue": "node scripts/update-exports.js",
     "acp": "tsx scripts/acp.ts",
+    "bacp": "tsx scripts/acp.ts -b",
     "update-version": "tsx scripts/update-version-config.ts",
     "v": "tsx scripts/update-version-config.ts",
+    "build": "tsc -noEmit -skipLibCheck",
+    "dev": "tsx scripts/esbuild.config.ts",
+    "real": "tsx scripts/esbuild.config.ts production real",
+    "lint": "eslint . --ext .ts",
+    "lint:fix": "eslint . --ext .ts --fix",
     "inject-path": "tsx scripts/inject-path.ts",
-    "inject": "tsx scripts/inject-path.ts",
     "inject-prompt": "tsx scripts/inject-prompt.ts",
     "check-plugin": "tsx scripts/inject-path.ts --dry-run",
     "build-npm": "tsx scripts/build-npm.ts",
     "publish-npm": "tsx scripts/build-npm.ts",
     "help": "tsx scripts/help.ts",
-    "h": "tsx scripts/help.ts",
-    "lint": "eslint . --ext .ts",
-    "lint:fix": "eslint . --ext .ts --fix",
-    "dev": "tsx scripts/esbuild.config.ts",
-    "build": "tsc -noEmit -skipLibCheck",
-    "real": "tsx scripts/esbuild.config.ts production real",
-    "bacp": "tsx scripts/acp.ts -b",
-    "release": "tsx scripts/release.ts",
-    "r": "tsx scripts/release.ts"
+    "h": "tsx scripts/help.ts"
   },
   "exports": {
     ".": "./src/index.ts",
@@ -94,4 +93,4 @@
     "url": "https://github.com/3C0D/obsidian-plugin-config.git"
   },
   "author": "3C0D"
-}
+}

package/scripts/inject-path.ts

@@ -3,7 +3,6 @@
 import fs from "fs";
 import path from "path";
 import { execSync } from "child_process";
-import dotenv from "dotenv";
 import {
   askConfirmation,
   createReadlineInterface,
@@ -11,9 +10,6 @@ import {
   gitExec
 } from "./utils.js";
 
-// Load environment variables from .env file
-dotenv.config();
-
 const rl = createReadlineInterface();
 
 interface InjectionPlan {
@@ -133,7 +129,7 @@ async function ensurePluginConfigClean(): Promise<void> {
           const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
           gitExec(`git push --set-upstream origin ${currentBranch}`);
           console.log(`✅ New branch pushed with upstream set`);
-        } catch (pushError) {
+        } catch {
           console.log(`⚠️  Changes committed locally but push failed. Continue with injection.`);
         }
       }
@@ -150,34 +146,13 @@ async function ensurePluginConfigClean(): Promise<void> {
  * Find plugin-config root directory
  */
 function findPluginConfigRoot(): string {
-  const envPath = process.env.PLUGIN_CONFIG_PATH?.trim();
-
-  // Option 1: local - check parent directory
-  if (envPath === "local") {
-    const parentPath = path.resolve(process.cwd(), "../obsidian-plugin-config");
-    if (fs.existsSync(parentPath)) {
-      return parentPath;
-    }
-    throw new Error("obsidian-plugin-config not found in parent directory");
-  }
-
-  // Option 2: prompt - skip auto-detection
-  if (envPath === "prompt") {
-    throw new Error("PROMPT_REQUIRED");
-  }
-
-  // Option 3: specific path
-  if (envPath && fs.existsSync(envPath)) {
-    return envPath;
-  }
-
-  // Option 4: auto-detect parent, fallback to current
+  // Option 1: auto-detect parent directory
   const parentPath = path.resolve(process.cwd(), "../obsidian-plugin-config");
   if (fs.existsSync(parentPath)) {
     return parentPath;
   }
 
-  // Option 5: Check if we're running from NPM package (global installation)
+  // Option 2: Check if we're running from NPM package (global installation)
   // Get the directory of this script file
   const scriptDir = path.dirname(new URL(import.meta.url).pathname);
   const npmPackageRoot = path.resolve(scriptDir, "..");
@@ -214,21 +189,20 @@ function copyFromLocal(filePath: string): string {
 }
 
 /**
- * Clean old script files (remove .mts versions if .ts exists, and other obsolete files)
+ * Clean old script files (remove existing scripts to ensure clean injection)
  */
 async function cleanOldScripts(scriptsPath: string): Promise<void> {
   const scriptNames = ["utils", "esbuild.config", "acp", "update-version", "release", "help"];
+  const extensions = [".ts", ".mts", ".js", ".mjs"];
 
-  // Remove old .mts files when .ts exists
+  // Remove all existing script files with any extension
   for (const scriptName of scriptNames) {
-    const mtsFile = path.join(scriptsPath, `${scriptName}.mts`);
-    const tsFile = path.join(scriptsPath, `${scriptName}.ts`);
-
-    if (await isValidPath(mtsFile) && await isValidPath(tsFile)) {
-      fs.unlinkSync(mtsFile);
-      console.log(`🗑️  Removed old ${scriptName}.mts (replaced by ${scriptName}.ts)`);
-    } else if (await isValidPath(mtsFile)) {
-      console.log(`ℹ️  Found old ${scriptName}.mts file (will be replaced by ${scriptName}.ts)`);
+    for (const ext of extensions) {
+      const scriptFile = path.join(scriptsPath, `${scriptName}${ext}`);
+      if (await isValidPath(scriptFile)) {
+        fs.unlinkSync(scriptFile);
+        console.log(`🗑️  Removed existing ${scriptName}${ext} (will be replaced)`);
+      }
     }
   }
 
@@ -605,82 +579,7 @@ function readInjectionInfo(targetPath: string): any | null {
   }
 }
 
-/**
- * Check if tsx is available and install it if needed
- */
-async function ensureTsxAvailable(targetPath: string): Promise<void> {
-  console.log(`\n🔍 Checking tsx availability...`);
 
-  try {
-    // Check if tsx is available globally
-    try {
-      execSync('tsx --version', { stdio: 'pipe' });
-      console.log(`   ✅ tsx is available globally`);
-      return;
-    } catch {
-      // tsx not available globally, continue to check locally
-    }
-
-    // Check if tsx is available locally in target
-    try {
-      execSync('npx tsx --version', {
-        cwd: targetPath,
-        stdio: 'pipe'
-      });
-      console.log(`   ✅ tsx is available locally`);
-      return;
-    } catch {
-      // tsx not available locally, need to install
-    }
-
-    console.log(`   ⚠️  tsx not found, installing as dev dependency...`);
-
-    // Install tsx as dev dependency
-    execSync('yarn add -D tsx', {
-      cwd: targetPath,
-      stdio: 'inherit'
-    });
-
-    console.log(`   ✅ tsx installed successfully`);
-
-  } catch (error) {
-    console.error(`   ❌ Failed to install tsx: ${error}`);
-    console.log(`   💡 You may need to install tsx manually: yarn add -D tsx`);
-    throw new Error('tsx installation failed');
-  }
-}
-
-/**
- * Clean NPM artifacts to avoid conflicts with Yarn
- */
-async function cleanNpmArtifacts(targetPath: string): Promise<void> {
-  console.log(`\n🧹 Cleaning NPM artifacts...`);
-
-  const packageLockPath = path.join(targetPath, "package-lock.json");
-  const nodeModulesPath = path.join(targetPath, "node_modules");
-
-  try {
-    // Remove package-lock.json if it exists
-    if (fs.existsSync(packageLockPath)) {
-      fs.unlinkSync(packageLockPath);
-      console.log(`   🗑️  Removed package-lock.json (NPM lock file)`);
-    }
-
-    // Remove node_modules if it exists
-    if (fs.existsSync(nodeModulesPath)) {
-      fs.rmSync(nodeModulesPath, { recursive: true, force: true });
-      console.log(`   🗑️  Removed node_modules (will be reinstalled with Yarn)`);
-    }
-
-    if (!fs.existsSync(packageLockPath) && !fs.existsSync(nodeModulesPath)) {
-      console.log(`   ✅ No NPM artifacts found`);
-    }
-
-  } catch (error) {
-    console.error(`   ❌ Failed to clean NPM artifacts: ${error}`);
-    console.log(`   💡 You may need to manually remove package-lock.json and node_modules`);
-  }
-}
 
 /**
  * Clean NPM artifacts if package-lock.json is found (evidence of NPM usage)

package/scripts/inject-prompt.ts

@@ -44,7 +44,7 @@ async function analyzePlugin(pluginPath: string): Promise<InjectionPlan> {
     try {
       const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
       plan.isObsidianPlugin = !!(manifest.id && manifest.name && manifest.version);
-    } catch (error) {
+    } catch {
       console.warn("Warning: Could not parse manifest.json");
     }
   }
@@ -57,7 +57,7 @@ async function analyzePlugin(pluginPath: string): Promise<InjectionPlan> {
         ...Object.keys(packageJson.dependencies || {}),
         ...Object.keys(packageJson.devDependencies || {})
       ];
-    } catch (error) {
+    } catch {
       console.warn("Warning: Could not parse package.json");
     }
   }
@@ -125,7 +125,7 @@ async function ensurePluginConfigClean(): Promise<void> {
           const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
           gitExec(`git push --set-upstream origin ${currentBranch}`);
           console.log(`✅ New branch pushed with upstream set`);
-        } catch (pushError) {
+        } catch {
           console.log(`⚠️  Changes committed locally but push failed. Continue with injection.`);
         }
       }
@@ -370,7 +370,7 @@ async function createInjectionInfo(targetPath: string): Promise<void> {
   try {
     const configPackageJson = JSON.parse(fs.readFileSync(configPackageJsonPath, "utf8"));
     injectorVersion = configPackageJson.version || "unknown";
-  } catch (error) {
+  } catch {
     console.warn("Warning: Could not read injector version");
   }
 

package/src/main.ts

@@ -0,0 +1,106 @@
+import {
+  App,
+  Plugin,
+  PluginSettingTab,
+  Setting,
+  Notice
+} from "obsidian";
+import { showConfirmModal } from "./modals/GenericConfirmModal.ts";
+// import { showTestMessage, getRandomEmoji } from "obsidian-plugin-config/tools";
+
+interface MyPluginSettings {
+  mySetting: string;
+}
+
+const DEFAULT_SETTINGS: MyPluginSettings = {
+  mySetting: "default"
+};
+
+export default class MyPlugin extends Plugin {
+  settings: MyPluginSettings;
+
+  async onload(): Promise<void> {
+    console.log("loading plugin");
+    await this.loadSettings();
+
+    this.addCommand({
+      id: 'show-confirmation-modal',
+      name: 'Show Confirmation Modal (Local)',
+      callback: () => this.showConfirmationModal()
+    });
+
+    this.addCommand({
+      id: 'show-centralized-modal',
+      name: 'Show Confirmation Modal (Centralized)',
+      callback: () => this.showCentralizedModal()
+    });
+
+    this.addCommand({
+      id: 'test-tools',
+      name: 'Test Centralized Tools',
+      callback: () => {
+        // const message = showTestMessage();
+        // const emoji = getRandomEmoji();
+        new Notice(`🎯 Test centralized tools (commented for autonomous mode)`);
+      }
+    });
+
+    this.addSettingTab(new SampleSettingTab(this.app, this));
+  }
+
+  private showConfirmationModal(): void {
+    showConfirmModal(this.app, {
+      title: "Confirmation requise",
+      message: "Êtes-vous sûr de vouloir effectuer cette action ? Cette action ne peut pas être annulée.",
+      confirmText: "Confirmer",
+      cancelText: "Annuler",
+      onConfirm: () => {
+        new Notice("Action confirmée !");
+        console.log("Action confirmée par l'utilisateur");
+      },
+      onCancel: () => {
+        new Notice("Action annulée.");
+        console.log("Action annulée par l'utilisateur");
+      }
+    });
+  }
+
+  private showCentralizedModal(): void {
+    showConfirmModal(this.app, {
+      title: "Centralized Modal Test",
+      message: "This modal comes from the centralized configuration! Pretty cool, right?",
+      confirmText: "Awesome!",
+      cancelText: "Not bad",
+      onConfirm: () => {
+        new Notice("Centralized modal confirmed! 🎉");
+      },
+      onCancel: () => {
+        new Notice("Centralized modal cancelled 😢");
+      }
+    });
+  }
+
+  async loadSettings(): Promise<void> {
+    this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
+  }
+
+  async saveSettings(): Promise<void> {
+    await this.saveData(this.settings);
+  }
+}
+
+class SampleSettingTab extends PluginSettingTab {
+  plugin: MyPlugin;
+
+  constructor(app: App, plugin: MyPlugin) {
+    super(app, plugin);
+    this.plugin = plugin;
+  }
+
+  display(): void {
+    const { containerEl } = this;
+    containerEl.empty();
+    new Setting(containerEl);
+  }
+}
+

package/src/utils/SettingsHelper.ts

@@ -167,7 +167,7 @@ export class SettingsHelper {
         arrow.style.marginRight = "8px";
         arrow.style.fontSize = "0.8em";
         
-        const toggle = () => {
+        const toggle = () : void => {
             const isCurrentlyOpen = contentEl.style.display !== "none";
             contentEl.style.display = isCurrentlyOpen ? "none" : "block";
             arrow.setText(isCurrentlyOpen ? "▶" : "▼");

package/versions.json

@@ -9,5 +9,6 @@
 	"1.0.7": "1.8.9",
 	"1.0.8": "1.8.9",
 	"1.0.9": "1.8.9",
-	"1.0.10": "1.8.9"
+	"1.0.10": "1.8.9",
+	"1.1.6": "1.8.9"
 }

package/src/test-centralized-utils.ts

@@ -1,23 +0,0 @@
-// Simple test file to verify centralized utils work
-// import { NoticeHelper } from "obsidian-plugin-config/utils";
-
-export function testCentralizedUtils(): void {
-    console.log("🧪 Testing centralized utils (commented for autonomous mode)...");
-
-    // Test different notice types (commented for autonomous mode)
-    // NoticeHelper.success("✅ Centralized utils are working!");
-
-    // setTimeout(() => {
-    //     NoticeHelper.info("ℹ️ This notice comes from the centralized config");
-    // }, 1000);
-
-    // setTimeout(() => {
-    //     NoticeHelper.warning("⚠️ This is a warning from centralized utils");
-    // }, 2000);
-
-    // setTimeout(() => {
-    //     NoticeHelper.custom("🚀", "Custom notice with rocket emoji!");
-    // }, 3000);
-
-    console.log("✅ All centralized utils tests completed (autonomous mode)!");
-}