adapt-authoring-jsonschema 1.4.6 → 1.5.1

package/.github/workflows/releases.yml

@@ -1,32 +1,17 @@
 name: Release
+
 on:
   push:
     branches:
       - master
 
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+  id-token: write
+  packages: write
+
 jobs:
   release:
-    name: Release
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # to be able to publish a GitHub release
-      issues: write # to be able to comment on released issues
-      pull-requests: write # to be able to comment on released pull requests
-      id-token: write # to enable use of OIDC for trusted publishing and npm provenance
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 'lts/*'
-      - name: Update npm
-        run: npm install -g npm@latest
-      - name: Install dependencies
-        run: npm install
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master

package/docs/plugins/schemas-reference.js

@@ -1,9 +1,4 @@
 export default class SchemasReference {
-  constructor (appData, config, dir, utils) {
-    this.appData = appData
-    this.utils = utils
-  }
-
   async run () {
     this.schemas = await this.loadSchemas()
     this.manualFile = 'schemas-reference.md'
@@ -12,7 +7,7 @@ export default class SchemasReference {
   }
 
   async loadSchemas () {
-    const { schemas, raw } = this.appData.schemas
+    const { schemas, raw } = this.app.schemas
     return Object.keys(schemas)
       .sort((a, b) => a.localeCompare(b))
       .reduce((m, s) => Object.assign(m, { [s]: raw[s] }), {})

package/lib/JsonSchemaModule.js

@@ -33,7 +33,7 @@ class JsonSchemaModule extends AbstractModule {
     this._library.on('schemaExtended', (base, ext) => this.log('verbose', 'EXTEND_SCHEMA', base, ext))
     this._library.on('reset', () => this.log('debug', 'RESET_SCHEMAS'))
 
-    await this._library.init()
+    this._library.init()
 
     this._library.addKeyword({
       keyword: 'isDirectory',
@@ -122,8 +122,8 @@ class JsonSchemaModule extends AbstractModule {
   /**
    * Empties the schema registry (with the exception of the base schema)
    */
-  async resetSchemaRegistry () {
-    await this._library.resetSchemaRegistry()
+  resetSchemaRegistry () {
+    this._library.resetSchemaRegistry()
   }
 
   /**
@@ -152,14 +152,17 @@ class JsonSchemaModule extends AbstractModule {
    * @return {Promise}
    */
   async registerSchemas (options = {}) {
-    await this.resetSchemaRegistry()
+    this.resetSchemaRegistry()
     await Promise.all(Object.values(this.app.dependencies).map(async d => {
       if (d.name === this.name) return
       const files = await glob('schema/*.schema.json', { cwd: d.rootDir, absolute: true })
-      const results = await Promise.allSettled(files.map(f => this.registerSchema(f)))
-      results
-        .filter(r => r.status === 'rejected')
-        .forEach(r => this.log('warn', r.reason))
+      for (const f of files) {
+        try {
+          this.registerSchema(f)
+        } catch (e) {
+          this.log('warn', e)
+        }
+      }
     }))
     await this.registerSchemasHook.invoke()
     if (options.quiet !== true) this.logSchemas()
@@ -170,11 +173,11 @@ class JsonSchemaModule extends AbstractModule {
    * @param {String} filePath Path to the schema file
    * @param {Object} options Extra options
    * @param {Boolean} options.replace Replace existing schema with same name
-   * @return {Promise<Schema>}
+   * @return {Schema}
    */
-  async registerSchema (filePath, options = {}) {
+  registerSchema (filePath, options = {}) {
     try {
-      return await this._library.registerSchema(filePath, options)
+      return this._library.registerSchema(filePath, options)
     } catch (e) {
       // Convert library errors to app errors
       if (e instanceof SchemaError) {
@@ -199,7 +202,7 @@ class JsonSchemaModule extends AbstractModule {
    * Creates a new Schema instance
    * @param {String} filePath Path to the schema file
    * @param {Object} options Options passed to Schema constructor
-   * @returns {Promise<Schema>}
+   * @returns {Schema}
    */
   createSchema (filePath, options = {}) {
     return this._library.createSchema(filePath, {
@@ -228,10 +231,10 @@ class JsonSchemaModule extends AbstractModule {
   async getSchema (schemaName, options = {}) {
     await this._schemasRegistered
     try {
-      return await this._library.getSchema(schemaName, options)
+      return this._library.getSchema(schemaName, options)
     } catch (e) {
       if (e instanceof SchemaError && e.code === 'MISSING_SCHEMA') {
-        throw this.app.errors.MISSING_SCHEMA.setData({ schemaName })
+        throw this.app.errors.MISSING_SCHEMA.setData({ schemaName: e.data?.schemaName ?? schemaName })
       }
       throw e
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-jsonschema",
-  "version": "1.4.6",
+  "version": "1.5.1",
   "description": "Module to add support for the JSON schema specification",
   "homepage": "https://github.com/adapt-security/adapt-authoring-jsonschema",
   "license": "GPL-3.0",
@@ -15,35 +15,17 @@
   "repository": "github:adapt-security/adapt-authoring-jsonschema",
   "dependencies": {
     "adapt-authoring-core": "^2.0.0",
-    "adapt-schemas": "^2.0.0"
+    "adapt-schemas": "^3.1.0"
   },
   "peerDependencies": {
     "adapt-authoring-config": "^1.1.4",
     "adapt-authoring-errors": "^1.1.2"
   },
   "devDependencies": {
-    "@semantic-release/git": "^10.0.1",
-    "conventional-changelog-eslint": "^6.0.0",
-    "semantic-release": "^25.0.2",
+    "@adaptlearning/semantic-release-config": "^1.0.0",
     "standard": "^17.1.0"
   },
   "release": {
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "eslint"
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "eslint"
-        }
-      ],
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
+    "extends": "@adaptlearning/semantic-release-config"
   }
 }

package/tests/JsonSchemaModule.spec.js

@@ -85,9 +85,9 @@ describe('JsonSchemaModule', () => {
   })
 
   describe('#resetSchemaRegistry()', () => {
-    it('should call the library resetSchemaRegistry', async () => {
+    it('should call the library resetSchemaRegistry', () => {
       const { instance, mockSchemas } = createInstance()
-      await instance.resetSchemaRegistry()
+      instance.resetSchemaRegistry()
       assert.equal(mockSchemas.resetSchemaRegistry.mock.calls.length, 1)
     })
   })