adapt-authoring-contentplugin 1.0.1 → 1.0.3

package/.github/workflows/standardjs.yml

@@ -0,0 +1,13 @@
+name: Standard.js formatting check
+on: push
+jobs:
+  default:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@master
+        with:
+          node-version: 'lts/*'
+          cache: 'npm'
+      - run: npm ci
+      - run: npx standard

package/lib/ContentPluginModule.js

@@ -106,7 +106,7 @@ class ContentPluginModule extends AbstractApiModule {
     return results
   }
 
-  async readJson(filepath) {
+  async readJson (filepath) {
     return JSON.parse(await fs.readFile(filepath))
   }
 
@@ -145,22 +145,27 @@ class ContentPluginModule extends AbstractApiModule {
    * @return {Promise}
    */
   async initPlugins () {
+    this.log('verbose', 'INIT_PLUGINS')
     const missing = await this.getMissingPlugins()
     if (missing.length) { // note we're using CLI directly, as plugins already exist in the DB
       this.log('debug', 'MISSING', missing)
       await this.framework.runCliCommand('installPlugins', { plugins: missing })
     }
-    await this.syncPluginData()
-    await this.processPluginSchemas()
+    const results = await Promise.allSettled([
+      this.syncPluginData(),
+      this.processPluginSchemas()
+    ])
+    results.forEach(r => r.status === 'rejected' && this.log('error', r.reason))
   }
 
   /**
    * Makes sure the database plugin data is in sync with the currently installed framework plugins
    */
-  async syncPluginData() {
+  async syncPluginData () {
+    this.log('verbose', 'SYNC_PLUGINS')
     const dbInfo = (await this.find()).reduce((memo, info) => Object.assign(memo, { [info.name]: info }), {})
     for (const i of await this.framework.runCliCommand('getPluginUpdateInfos')) {
-      if(dbInfo[i.name]?.version !== i.matchedVersion) {
+      if (dbInfo[i.name]?.version !== i.matchedVersion) {
         this.log('debug', 'SYNC', i.name, 'local:', dbInfo[i.name]?.version, 'fw:', i.matchedVersion)
         await this.insertOrUpdate({ ...(await i.getInfo()), type: await i.getType(), isLocalInstall: i.isLocalSource })
       }
@@ -172,10 +177,11 @@ class ContentPluginModule extends AbstractApiModule {
    * If no plugins are defined in the database, it returns all plugins defined in the framework manifest
    * @return {Array} List of plugin names mapped to version/dir
    */
-  async getMissingPlugins() {
+  async getMissingPlugins () {
     const dbPlugins = await this.find()
-    if (!dbPlugins.length)
+    if (!dbPlugins.length) {
       return (await this.framework.getManifestPlugins()).map(([name, version]) => `${name}@${version}`)
+    }
     const fwPlugins = await this.framework.getInstalledPlugins()
     return dbPlugins
       .filter(dbP => !fwPlugins.find(fwP => dbP.name === fwP.name))
@@ -184,13 +190,16 @@ class ContentPluginModule extends AbstractApiModule {
 
   /**
    * Loads and processes all installed content plugin schemas
-   * @param {Array} pluginInfo Plugin info data
+   * @param {Array|Object} pluginInfo Plugin info data
    * @return {Promise}
    */
   async processPluginSchemas (pluginInfo) {
     if (!pluginInfo) {
       pluginInfo = await this.framework.runCliCommand('getPluginUpdateInfos')
     }
+    if (!Array.isArray(pluginInfo)) {
+      pluginInfo = [pluginInfo]
+    }
     const jsonschema = await this.app.waitForModule('jsonschema')
     return Promise.all(pluginInfo.map(async plugin => {
       const name = plugin.name
@@ -291,7 +300,7 @@ class ContentPluginModule extends AbstractApiModule {
   async installPlugin (pluginName, versionOrPath, options = { strict: false, force: false }) {
     const [pluginData] = await this.find({ name: String(pluginName) }, { includeUpdateInfo: true })
     const { name, version, sourcePath, isLocalInstall } = await this.processPluginFiles({ ...pluginData, sourcePath: versionOrPath })
-    const [ existingPlugin ] = await this.find({ name })
+    const [existingPlugin] = await this.find({ name })
 
     if (existingPlugin) {
       if (!options.force && semver.lte(version, existingPlugin.version)) {
@@ -313,7 +322,7 @@ class ContentPluginModule extends AbstractApiModule {
       throw this.app.errors.CONTENTPLUGIN_ATTR_MISSING
         .setData({ name })
     }
-    await this.processPluginSchemas([data])
+    await this.processPluginSchemas(data)
     return info
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-contentplugin",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Module for managing framework plugins",
   "homepage": "https://github.com/adapt-security/adapt-authoring-contentplugin",
   "main": "index.js",
@@ -11,7 +11,6 @@
     "semver": "^7.6.0"
   },
   "devDependencies": {
-    "eslint": "^9.12.0",
     "standard": "^17.1.0",
     "@semantic-release/commit-analyzer": "^9.0.2",
     "@semantic-release/git": "^10.0.1",

package/.eslintignore

@@ -1 +0,0 @@
-node_modules

package/.eslintrc

@@ -1,14 +0,0 @@
-{
-  "env": {
-      "browser": false,
-      "node": true,
-      "commonjs": false,
-      "es2020": true
-  },
-  "extends": [
-      "standard"
-  ],
-  "parserOptions": {
-      "ecmaVersion": 2020
-  }
-}