centinels changed

Author: RafaelGB

TestVault/template/database.md

@@ -4,7 +4,7 @@ database-plugin: basic
 
 ---
 
-<%%
+%% dbfolder:yaml
 name: new database
 description: new description
 columns:
@@ -137,4 +137,4 @@ config:
   source_form_result: 
   show_metadata_tasks: true
 filters:
-%%>
+%%

docs/docs/about.md

@@ -39,13 +39,7 @@ Each database has a yaml local configuration that is read when you open the data
 database-plugin: basic
 
 ---
-<%%
----
-
-database-plugin: basic
-
----
-<%%
+%% dbfolder:yaml
 name: Entertaiment
 description: All media contain that I consume
 columns:
@@ -173,5 +167,5 @@ config:
   source_data: current_folder
   source_form_result: zettelcaster/meet
 filters:
-%%>
+%%
 ```

src/helpers/CommandsHelper.ts

@@ -20,7 +20,7 @@ export async function generateNewDatabase(ddbbConfig: string, folder?: TFolder,
                 .concat('\n')
                 .concat(ddbbConfig)
                 .concat('\n')
-                .concat('%%>')
+                .concat('%%')
         );
         await app.workspace.getMostRecentLeaf().setViewState({
             type: DatabaseCore.FRONTMATTER_KEY,

src/helpers/Constants.ts

@@ -203,7 +203,7 @@ export const DatabaseFrontmatterOptions = Object.freeze({
     '',
     '---',
     '',
-    '<%%',
+    '%% dbfolder:yaml',
     'name: new database',
     'description: new description',
     'columns:',
@@ -354,7 +354,18 @@ export const DEFAULT_SETTINGS: DatabaseSettings = {
   }
 };
 /******************************************************************************
- *                          SUGGESTER CONSTANTS
+ *                            DATABASE_CONFIG REGEX
+ ******************************************************************************/
+export const DATABASE_CONFIG = Object.freeze({
+  YAML: /%%\sdbfolder:yaml\s+([\w\W]+?)\s+%%/,
+  REPLACE_YAML_REGEX: new RegExp(`<%%\\s+([\\w\\W]+?)\\s+%%>`, "g"),
+  START_CENTINEL: '%% dbfolder:yaml',
+  END_CENTINEL: '%%',
+  START_CENTINEL_LEGACY: '<%%',
+  END_CENTINEL_LEGACY: '%%>',
+});
+/******************************************************************************
+ *                            SUGGESTER REGEX
  ******************************************************************************/
 export const SUGGESTER_REGEX = Object.freeze({
   LINK: /\B\[\[([^\]]*)$/,
@@ -368,7 +379,7 @@ export const SUGGESTER_REGEX = Object.freeze({
 });
 
 /******************************************************************************
- *                          ICONS CONSTANTS
+ *                                ICONS
  ******************************************************************************/
 export const DB_ICONS = Object.freeze({
   NAME: 'database-folder-icon',

src/services/DatabaseInfo.ts

@@ -10,6 +10,7 @@ import { ConfigColumn, NoteContentAction } from 'cdm/FolderModel';
 import { FilterCondition, FilterSettings, LocalSettings } from 'cdm/SettingsModel';
 import { isDatabaseNote } from 'helpers/VaultManagement';
 import DatabaseStringToYamlParser from 'parsers/DatabaseStringToYamlParser';
+import { DATABASE_CONFIG } from 'helpers/Constants';
 
 export default class DatabaseInfo {
     private file: TFile;
@@ -25,10 +26,13 @@ export default class DatabaseInfo {
      */
     async initDatabaseconfigYaml(default_local_settings: LocalSettings): Promise<void> {
         LOGGER.info(`=>initDatabaseconfigYaml`, `file:${this.file.path}`);
-        const databaseRaw = await VaultManagerDB.obtainContentFromTfile(this.file);
+        let databaseRaw = await VaultManagerDB.obtainContentFromTfile(this.file);
         if (!databaseRaw || !isDatabaseNote(databaseRaw)) throw new Error('No frontmatter found');
+        // Temporal migration centinels code
+        databaseRaw = databaseRaw.replaceAll(DATABASE_CONFIG.START_CENTINEL_LEGACY, DATABASE_CONFIG.START_CENTINEL);
+        databaseRaw = databaseRaw.replaceAll(DATABASE_CONFIG.END_CENTINEL_LEGACY, DATABASE_CONFIG.END_CENTINEL);
 
-        const match = databaseRaw.match(/<%%\s+([\w\W]+?)\s+%%>/);
+        const match = databaseRaw.match(DATABASE_CONFIG.YAML);
 
         if (!match) {
             return null;
@@ -52,14 +56,13 @@ export default class DatabaseInfo {
      */
     async saveOnDisk(): Promise<void> {
         LOGGER.debug(`=>setDatabaseconfigYaml`, `file:${this.file.path}`);
-        const configRegex = new RegExp(`<%%\\s+([\\w\\W]+?)\\s+%%>`, "g");
         const databaseFilePath = this.file.path;
         const databaseConfigUpdated = DatabaseYamlToStringParser(this.yaml).join("\n");
         const noteObject: NoteContentAction = {
             action: 'replace',
             file: this.file,
-            regexp: configRegex,
-            newValue: `<%%\n${databaseConfigUpdated}\n%%>`
+            regexp: DATABASE_CONFIG.REPLACE_YAML_REGEX,
+            newValue: `${DATABASE_CONFIG.START_CENTINEL}\n${databaseConfigUpdated}\n${DATABASE_CONFIG.END_CENTINEL}`
         };
         // Update configuration file
         await VaultManagerDB.editNoteContent(noteObject);