adapt-authoring-jsonschema 1.5.0 → 1.6.0

package/.github/workflows/releases.yml

@@ -10,7 +10,8 @@ permissions:
   issues: write
   pull-requests: write
   id-token: write
+  packages: write
 
 jobs:
   release:
-    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master
+    uses: adaptlearning/semantic-release-config/.github/workflows/release.yml@master

package/lib/JsonSchemaModule.js

@@ -1,6 +1,5 @@
 import { AbstractModule, App, Hook } from 'adapt-authoring-core'
 import { glob } from 'glob'
-import path from 'path'
 import { Schemas, SchemaError, XSSDefaults } from 'adapt-schemas'
 
 /**
@@ -41,19 +40,9 @@ class JsonSchemaModule extends AbstractModule {
       modifying: true,
       schemaType: 'boolean',
       compile: function () {
-        const doReplace = value => {
-          const app = App.instance
-          return [
-            ['$ROOT', app.rootDir],
-            ['$DATA', app.getConfig('dataDir')],
-            ['$TEMP', app.getConfig('tempDir')]
-          ].reduce((m, [k, v]) => {
-            return m.startsWith(k) ? path.resolve(v, m.replace(k, '').slice(1)) : m
-          }, value)
-        }
         return (value, { parentData, parentDataProperty }) => {
           try {
-            parentData[parentDataProperty] = doReplace(value)
+            parentData[parentDataProperty] = App.instance.config.resolveDirectory(value)
           } catch (e) {}
           return true
         }
@@ -61,7 +50,6 @@ class JsonSchemaModule extends AbstractModule {
     })
 
     this._schemasRegistered = this.onReady()
-      .then(() => this.app.waitForModule('config', 'errors'))
       .then(() => {
         // Update library options from config
         this._library.options.enableCache = this.getConfig('enableCache')
@@ -234,7 +222,7 @@ class JsonSchemaModule extends AbstractModule {
       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
     }
@@ -245,8 +233,8 @@ class JsonSchemaModule extends AbstractModule {
    */
   logSchemas () {
     this.log('debug', 'SCHEMAS', Object.keys(this.schemas))
-    this.log('debug', 'SCHEMA_EXTENSIONS', Object.entries(this.schemas).reduce((m, [k, v]) => {
-      if (v.extensions.length) m[k] = v.extensions
+    this.log('debug', 'SCHEMA_EXTENSIONS', Object.entries(this.schemaExtensions).reduce((m, [k, v]) => {
+      if (v?.length) m[k] = v
       return m
     }, {}))
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-jsonschema",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Module to add support for the JSON schema specification",
   "homepage": "https://github.com/adapt-security/adapt-authoring-jsonschema",
   "license": "GPL-3.0",
@@ -14,13 +14,9 @@
   },
   "repository": "github:adapt-security/adapt-authoring-jsonschema",
   "dependencies": {
-    "adapt-authoring-core": "^2.0.0",
+    "adapt-authoring-core": "^3.0.0",
     "adapt-schemas": "^3.1.0"
   },
-  "peerDependencies": {
-    "adapt-authoring-config": "^1.1.4",
-    "adapt-authoring-errors": "^1.1.2"
-  },
   "devDependencies": {
     "@adaptlearning/semantic-release-config": "^1.0.0",
     "standard": "^17.1.0"