fcad-core-dragon 2.0.0-beta.5 → 2.0.0-beta.7

package/src/router/index.js

@@ -30,7 +30,8 @@ router.beforeResolve((to, from, next) => {
   if (getPopupIsOpen) app.config.globalProperties.$bus.$emit('close-popup') //close the popup
   if (getSidebarIsOpen) app.config.globalProperties.$bus.$emit('close-sidebar') //close the sidebar
 
-  app.config.globalProperties.$bus.$emit('update-route-history', from)
+  if (from.name !== 'module')
+    app.config.globalProperties.$bus.$emit('update-route-history', from)
   app.config.globalProperties.$bus.$emit('update-content', to, from, next)
 
   if (noNavigationToMenu && to.name == 'menu') {

package/src/shared/generalfuncs.js

@@ -1,210 +1,210 @@
-// const allfile = require.context('@/', true, /\.vue$/) //get all .vue file at the root of the project where lib will be installed
-const allfile = import.meta.glob(['@/**/*.vue', '!@/**/_*'], {
-  eager: true
-}) //get all .vue file at the root of the project where lib will be installed
-
-const allfileKeys = Object.keys(allfile)
-
-//console.log('ALL PATHS', fileArray)
-allfileKeys.forEach(function (key, index, array) {
-  array[index] = {
-    name: key.replace('/src', '.').replace('.vue', ''),
-    fullPath: allfile[key].default.__file,
-    content: allfile[key].default
-  }
-})
-
-const fileAssets = {
-  // return the collection of all the files in the project directory
-  allFiles: () => allfileKeys,
-
-  // Return all the file in './views' with the Name Module
-  getViews: () => {
-    return fileAssets
-      .allFiles()
-      .filter(
-        (file) =>
-          file.name.startsWith('./views') &&
-          !file.name.split('/')[2].includes('copy')
-      )
-  },
-  // return all files that are in the folder './src/module' of the project with name respecting following condition:
-  // must start with a capital P followed by a digit (P0, P1, P2...) and not contain keyword "copy"
-  getActivities: () => {
-    return fileAssets.allFiles().filter((file) => {
-      if (
-        file.name.startsWith('./module/A') &&
-        /^P[0-9]{2,3}/.test(file.name.split('/')[3]) &&
-        !file.name.split('/')[3].includes('copy')
-      )
-        return true
-      else return false
-    })
-  },
-
-  // search a specific file and return its content
-  fetchFileContent: (file) => allfile[file].default,
-
-  /**
-   * @description Validator for the content of menu setting file
-   * @param {String} fName- name of the file for use case
-   * @param {Object} fData: file's data to validate
-   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
-   */
-  validatefileContent: (fName, fData, requiredArgs = {}) => {
-    let err = null
-    if (import.meta.env.DEV) {
-      switch (fName) {
-        case 'menuSettings': {
-          const { keys4Activity, keys4Anchors } = requiredArgs
-
-          //*validate that data is an {Object}. if Not send error message
-          if (fData.constructor !== Object)
-            err = '💥Invalid file provided for menu settings'
-
-          if (Object.entries(fData).length > 0) {
-            const content = Object.entries(fData)
-
-            for (let el of content) {
-              // validate that the content of each entry is an object
-              if (el[1].constructor !== Object || !Object.keys(el[1]).length) {
-                err = `💥 invalid data provided for key 👉 ${el[0]} 👈 in ➡ menu.setting.js \n  🚩Must be of type {Object}`
-                break
-              }
-            }
-            // Validate that each entry has the required key
-            if (!err) {
-              for (let el of content) {
-                const entry = el[1]
-                for (let k of keys4Activity) {
-                  if (!entry[k]) {
-                    err = `💥 Missing 👉 ${k} 👈 in ${el[0]} in ➡ menu.setting.js \n  🚩Allowed indexes are: 👉 ${keys4Activity}`
-                    break
-                  } else {
-                    //validate that each entry as correct value type
-                    switch (k) {
-                      case 'anchors':
-                        if (entry[k].constructor !== Array)
-                          err = `💥 Invalid anchors declaration for 👉 ${el[0]} 👈 in ➡ menu.setting.j \n  🚩Must be of type {Array}`
-                        else {
-                          const anchors = entry.anchors
-
-                          for (let a of anchors) {
-                            //trow error if numbers of keys are not the same as required
-                            const a_numb = anchors.indexOf(a) + 1
-                            if (Object.keys(a).length !== keys4Anchors.length) {
-                              err = `💥 Invalid declaration in 👉anchor ${a_numb}👈  for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Allowed indexes are: 👉 ${keys4Anchors}`
-                              break
-                            }
-                            // Validated that required keys condition and type is met
-                            for (let k of keys4Anchors) {
-                              if (!a[k]) {
-                                err = `💥 Missing 👉 ${k} 👈 for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n 🚩 Allowed indexes are: 👉 ${keys4Anchors}`
-                              } else if (a[k].constructor !== String) {
-                                err = `💥 Invalid 👉 ${k} 👈 declaration for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n  🚩 Must be of type {String}`
-                              }
-                              if (err) break
-                            }
-                            if (err) break
-                          }
-                        }
-
-                        break
-                      default:
-                        if (entry[k].constructor !== String)
-                          err = `Invalid 👉 ${k} 👈 declaration for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Must be of type {String}`
-                        break
-                    }
-                  }
-                }
-
-                if (err) break
-              }
-            }
-          }
-          break
-        }
-      }
-    }
-    return err
-  },
-
-  /**
-   * @description Validator for the content of menu setting file
-   * @param {String} a- array of file for use case
-   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
-   */
-  buildMapTree: (a) => {
-    // Load files in module folder
-
-    if (a.length < 0) return
-
-    const mapTree = new Map()
-    // There is a file in the module folder
-
-    a.forEach((e) => {
-      const fileRef = e.name.replace(/(\.\/)/g, '')
-      const splitted = fileRef.split('/')
-      const activityName = splitted[1]
-      const fileName = splitted[splitted.length - 1].replace(/(\.vue)/g, '')
-      const fileContent = e.content
-      if (!Object.keys(fileContent).includes('data')) return
-      // Handling single page type
-      // adding the page in a map for the Pages
-
-      // Add the key in the map for the routes if it is not in the map, with its data as new Map;
-      if (!mapTree.get(activityName)) {
-        mapTree.set(activityName, new Map())
-      }
-
-      if (fileName.length === 3) {
-        mapTree.get(activityName).set(fileName, {
-          ref: fileRef,
-          content: fileContent.data(),
-          fullPath: e.fullPath
-        }) // add entry for the page
-      }
-      // Handleling Groupe page type
-      else if (fileName.length > 3 && fileName.includes('_')) {
-        const keyToFind = fileName.split('_', 1)[0] // Pxx
-        const KeyToAdd = fileName.split('_')[1] // Exx
-
-        // // search for the page key in the map
-        if (!mapTree.get(activityName).has(keyToFind)) return
-
-        // save a reference for the value of the key
-        const tempSave = mapTree.get(activityName).get(keyToFind)
-
-        // transform value of found key to a new map
-        if (!mapTree.get(activityName).get(keyToFind).size) {
-          mapTree.get(activityName).set(keyToFind, new Map())
-          // Update reference of key's
-          mapTree.get(activityName).get(keyToFind).set(keyToFind, tempSave)
-        }
-
-        // Add page EXX in Map if it is not already added
-        if (!mapTree.get(activityName).get(keyToFind).get(KeyToAdd))
-          mapTree.get(activityName).get(keyToFind).set(fileName, {
-            ref: fileRef,
-            content: fileContent.data(),
-            fullPath: e.fullPath
-          })
-      }
-    })
-
-    return mapTree
-  },
-
-  /**
-   * @description Capitalize word in string
-   * @param {String} a- array of file for use case
-   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
-   */
-  capitalize: (string) => {
-    let formatted = string.replaceAll('_', ' ').toLowerCase()
-    formatted = `${formatted.substring(0, 1).toUpperCase()}${formatted.slice(1).toLowerCase()}`
-    return formatted
-  }
-}
-
-export { fileAssets }
+// const allfile = require.context('@/', true, /\.vue$/) //get all .vue file at the root of the project where lib will be installed
+const allfile = import.meta.glob(['@/**/*.vue', '!@/**/_*'], {
+  eager: true
+}) //get all .vue file at the root of the project where lib will be installed
+
+const allfileKeys = Object.keys(allfile)
+
+//console.log('ALL PATHS', fileArray)
+allfileKeys.forEach(function (key, index, array) {
+  array[index] = {
+    name: key.replace('/src', '.').replace('.vue', ''),
+    fullPath: allfile[key].default.__file,
+    content: allfile[key].default
+  }
+})
+
+const fileAssets = {
+  // return the collection of all the files in the project directory
+  allFiles: () => allfileKeys,
+
+  // Return all the file in './views' with the Name Module
+  getViews: () => {
+    return fileAssets
+      .allFiles()
+      .filter(
+        (file) =>
+          file.name.startsWith('./views') &&
+          !file.name.split('/')[2].includes('copy')
+      )
+  },
+  // return all files that are in the folder './src/module' of the project with name respecting following condition:
+  // must start with a capital P followed by a digit (P0, P1, P2...) and not contain keyword "copy"
+  getActivities: () => {
+    return fileAssets.allFiles().filter((file) => {
+      if (
+        file.name.startsWith('./module/A') &&
+        /^P[0-9]{2,3}/.test(file.name.split('/')[3]) &&
+        !file.name.split('/')[3].includes('copy')
+      )
+        return true
+      else return false
+    })
+  },
+
+  // search a specific file and return its content
+  fetchFileContent: (file) => allfile[file].default,
+
+  /**
+   * @description Validator for the content of menu setting file
+   * @param {String} fName- name of the file for use case
+   * @param {Object} fData: file's data to validate
+   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
+   */
+  validatefileContent: (fName, fData, requiredArgs = {}) => {
+    let err = null
+    if (import.meta.env.DEV) {
+      switch (fName) {
+        case 'menuSettings': {
+          const { keys4Activity, keys4Anchors } = requiredArgs
+
+          //*validate that data is an {Object}. if Not send error message
+          if (fData.constructor !== Object)
+            err = '💥Invalid file provided for menu settings'
+
+          if (Object.entries(fData).length > 0) {
+            const content = Object.entries(fData)
+
+            for (let el of content) {
+              // validate that the content of each entry is an object
+              if (el[1].constructor !== Object || !Object.keys(el[1]).length) {
+                err = `💥 invalid data provided for key 👉 ${el[0]} 👈 in ➡ menu.setting.js \n  🚩Must be of type {Object}`
+                break
+              }
+            }
+            // Validate that each entry has the required key
+            if (!err) {
+              for (let el of content) {
+                const entry = el[1]
+                for (let k of keys4Activity) {
+                  if (!entry[k]) {
+                    err = `💥 Missing 👉 ${k} 👈 in ${el[0]} in ➡ menu.setting.js \n  🚩Allowed indexes are: 👉 ${keys4Activity}`
+                    break
+                  } else {
+                    //validate that each entry as correct value type
+                    switch (k) {
+                      case 'anchors':
+                        if (entry[k].constructor !== Array)
+                          err = `💥 Invalid anchors declaration for 👉 ${el[0]} 👈 in ➡ menu.setting.j \n  🚩Must be of type {Array}`
+                        else {
+                          const anchors = entry.anchors
+
+                          for (let a of anchors) {
+                            //trow error if numbers of keys are not the same as required
+                            const a_numb = anchors.indexOf(a) + 1
+                            if (Object.keys(a).length !== keys4Anchors.length) {
+                              err = `💥 Invalid declaration in 👉anchor ${a_numb}👈  for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Allowed indexes are: 👉 ${keys4Anchors}`
+                              break
+                            }
+                            // Validated that required keys condition and type is met
+                            for (let k of keys4Anchors) {
+                              if (!a[k]) {
+                                err = `💥 Missing 👉 ${k} 👈 for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n 🚩 Allowed indexes are: 👉 ${keys4Anchors}`
+                              } else if (a[k].constructor !== String) {
+                                err = `💥 Invalid 👉 ${k} 👈 declaration for anchor ${a_numb} ➡ ${el[0]} ➡ menu.setting.js \n  🚩 Must be of type {String}`
+                              }
+                              if (err) break
+                            }
+                            if (err) break
+                          }
+                        }
+
+                        break
+                      default:
+                        if (entry[k].constructor !== String)
+                          err = `Invalid 👉 ${k} 👈 declaration for ➡ ${el[0]} in ➡ menu.setting.js \n  🚩 Must be of type {String}`
+                        break
+                    }
+                  }
+                }
+
+                if (err) break
+              }
+            }
+          }
+          break
+        }
+      }
+    }
+    return err
+  },
+
+  /**
+   * @description Validator for the content of menu setting file
+   * @param {String} a- array of file for use case
+   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
+   */
+  buildMapTree: (a) => {
+    // Load files in module folder
+
+    if (a.length < 0) return
+
+    const mapTree = new Map()
+    // There is a file in the module folder
+
+    a.forEach((e) => {
+      const fileRef = e.name.replace(/(\.\/)/g, '')
+      const splitted = fileRef.split('/')
+      const activityName = splitted[1]
+      const fileName = splitted[splitted.length - 1].replace(/(\.vue)/g, '')
+      const fileContent = e.content
+      if (!Object.keys(fileContent).includes('data')) return
+      // Handling single page type
+      // adding the page in a map for the Pages
+
+      // Add the key in the map for the routes if it is not in the map, with its data as new Map;
+      if (!mapTree.get(activityName)) {
+        mapTree.set(activityName, new Map())
+      }
+
+      if (fileName.length === 3) {
+        mapTree.get(activityName).set(fileName, {
+          ref: fileRef,
+          content: fileContent.data(),
+          fullPath: e.fullPath
+        }) // add entry for the page
+      }
+      // Handleling Groupe page type
+      else if (fileName.length > 3 && fileName.includes('_')) {
+        const keyToFind = fileName.split('_', 1)[0] // Pxx
+        const KeyToAdd = fileName.split('_')[1] // Exx
+
+        // // search for the page key in the map
+        if (!mapTree.get(activityName).has(keyToFind)) return
+
+        // save a reference for the value of the key
+        const tempSave = mapTree.get(activityName).get(keyToFind)
+
+        // transform value of found key to a new map
+        if (!mapTree.get(activityName).get(keyToFind).size) {
+          mapTree.get(activityName).set(keyToFind, new Map())
+          // Update reference of key's
+          mapTree.get(activityName).get(keyToFind).set(keyToFind, tempSave)
+        }
+
+        // Add page EXX in Map if it is not already added
+        if (!mapTree.get(activityName).get(keyToFind).get(KeyToAdd))
+          mapTree.get(activityName).get(keyToFind).set(fileName, {
+            ref: fileRef,
+            content: fileContent.data(),
+            fullPath: e.fullPath
+          })
+      }
+    })
+
+    return mapTree
+  },
+
+  /**
+   * @description Capitalize word in string
+   * @param {String} a- array of file for use case
+   * @param {Object} [requiredArgs] list of arguments to include consider in validation ()
+   */
+  capitalize: (string) => {
+    let formatted = string.replaceAll('_', ' ').toLowerCase()
+    formatted = `${formatted.substring(0, 1).toUpperCase()}${formatted.slice(1).toLowerCase()}`
+    return formatted
+  }
+}
+
+export { fileAssets }

package/src/shared/validators.js

@@ -347,6 +347,7 @@ const validateAudioData = (data) => {
     }
     //** Validate if all the properties are right**/
     let wrongProperties = checkerWrong(allProperties, currentProperties)
+
     if (wrongProperties.length > 0) {
       console.warn(
         `%c WARNING!>>> AppCompAudio : audData property ${wrongProperties} invalid. Required properties: ${requiredProperties} . Optional properties: ${optionalProperties}`,
@@ -359,6 +360,7 @@ const validateAudioData = (data) => {
 
     //** Validate if all the required properties are in the data */
     let missingRequired = checkerMissing(requiredProperties, currentProperties)
+
     if (missingRequired.length > 0) {
       console.warn(
         `%c WARNING!>>>  AppCompAudio : audData missing required ${missingRequired} property. Required properties: ${requiredProperties} . Optional properties: ${optionalProperties}`,