@koumoul/vjsf 2.9.0 → 2.10.2

package/lib/VJsfNoDeps.js

@@ -18,7 +18,8 @@ import Validatable from './mixins/Validatable'
 import Dependent from './mixins/Dependent'
 const expr = require('property-expr')
 
-const debugFlag = global.navigator && global.navigator.cookieEnabled && global.localStorage && global.localStorage.debug
+const debugExpr = require('debug')('vjsf:expr')
+debugExpr.log = console.log.bind(console)
 
 const mountingIncs = {}
 
@@ -61,7 +62,6 @@ export default {
       return this.fullKey === 'root' ? (this.options || {}) : this.optionsRoot
     },
     fullOptions() {
-      this.debug('compute fullOptions')
       const _global = (typeof window !== 'undefined' && window) || (typeof global !== 'undefined' && global) || {}
       const fullOptions = Object.assign({}, defaultOptions, this.options || {}, this.resolvedSchema['x-options'] || {})
 
@@ -125,7 +125,6 @@ export default {
     },
     resolvedSchema() {
       if (this.modelKey === 'root') {
-        this.debug('compute resolvedSchema')
         const options = this.options || {}
         const locale = options.locale || options.defaultLocale || 'en'
         const defaultLocale = options.defaultLocale || 'en'
@@ -138,7 +137,6 @@ export default {
       }
     },
     htmlDescription() {
-      this.debug('compute htmlDescription')
       return this.fullOptions.markdown(this.fullSchema && this.fullSchema.description)
     },
     fullKey() {
@@ -157,7 +155,6 @@ export default {
       return this.fullSchema['x-tag']
     },
     rules() {
-      this.debug('compute rules')
       if (!this.fullSchema) return
       return getRules(this.schema, this.fullSchema, this.fullOptions, this.required, this.isOneOfSelect)
     },
@@ -174,7 +171,6 @@ export default {
       return this.fullSchema['x-display'] && this.fullSchema['x-display'].startsWith('custom-') ? this.fullSchema['x-display'] : this.fullKey
     },
     slotParams() {
-      this.debug('compute slotParams')
       if (!this.fullSchema) return
       return {
         value: this.value,
@@ -199,7 +195,6 @@ export default {
     },
     // props common to many vuetify fields
     commonFieldProps() {
-      this.debug('compute commonFieldProps')
       if (!this.fullSchema) return
       const value = this.separator && typeof this.value === 'string' ? this.value.split(this.separator) : this.value
       return {
@@ -255,8 +250,6 @@ export default {
       throw new Error('detected infinite mounting loop: ' + this.fullKey)
     } */
 
-    this.debug('mounted', mountingIncs[this.fullKey])
-
     // optimize the watcher used to reprocess fullSchema so that we trigger less re-render of components
     let watcher = 'resolvedSchema'
     if (this.resolvedSchema.dependencies || this.resolvedSchema.if) {
@@ -266,9 +259,7 @@ export default {
       const fullSchema = schemaUtils.prepareFullSchema(this.resolvedSchema, this.value, this.fullOptions)
       // kinda hackish but prevents triggering large rendering chains when nothing meaningful changes
       if (deepEqual(fullSchema, this.fullSchema)) {
-        this.debug('fullSchema no change detected')
       } else {
-        this.debug('fullSchema changed')
         this.fullSchema = fullSchema
       }
     }, {
@@ -282,7 +273,6 @@ export default {
     /* if (this.renderInc === 100) {
       throw new Error('detected infinite rendering loop: ' + this.fullKey)
     } */
-    this.debug('render', this.renderInc)
 
     // hide const ? Or make a readonly field ?
     if (!this.fullSchema || this.fullSchema.const !== undefined || this.display === 'hidden' || (this.fullSchema.readOnly && this.fullOptions.hideReadOnly)) {
@@ -331,9 +321,6 @@ export default {
     return h('v-col', { props: colProps, class: this.propertyClass, style: this.fullSchema['x-style'] || '' }, children)
   },
   methods: {
-    debug(msg, param) {
-      if (debugFlag === '*' || debugFlag === this.fullKey) console.log(`[${this.fullKey}] ${msg}`, param || '')
-    },
     cached(key, params, fn) {
       this._vjsf_cache = this._vjsf_cache || {}
       if (!this._vjsf_cache[key] || !deepEqual(this._vjsf_cache[key].params, params)) {
@@ -346,30 +333,35 @@ export default {
     },
     // used by all functionalities that require looking into the data or the context (x-if, fromData, etc)
     getFromExpr(exp) {
-      const expData = {
-        modelRoot: this.modelRoot,
-        root: this.modelRoot,
-        model: this.value,
-        value: this.value,
-        context: this.options.context
-      }
+      const expData = this.getExprNode()
+      expData.modelRoot = this.modelRoot
+      expData.root = this.modelRoot
+      expData.model = this.value
+      expData.context = this.options.context
+
       this._vjsf_getters = this._vjsf_getters || {}
 
       if (this.initialOptions.evalMethod === 'newFunction') {
+        debugExpr(`evaluate expression "${exp}" with newFunction method`, expData)
         // use a powerful meta-programming approach with "new Function", not safe if the schema is user-submitted
         // eslint-disable-next-line no-new-func
         this._vjsf_getters[exp] = this._vjsf_getters[exp] || new Function(...Object.keys(expData), `return ${exp}`)
-        return this._vjsf_getters[exp](...Object.values(expData))
+        const result = this._vjsf_getters[exp](...Object.values(expData))
+        debugExpr(`result`, result)
+        return result
       } else {
         exp = this.prefixExpr(exp)
+        debugExpr(`evaluate expression "${exp}" with propertyExpr method`, expData)
         // otherwise a safer but not as powerful deep getter method
         this._vjsf_getters[exp] = this._vjsf_getters[exp] || expr.getter(exp, true)
-        return this._vjsf_getters[exp](expData)
+        const result = this._vjsf_getters[exp](expData)
+        debugExpr(`result`, result)
+        return result
       }
     },
     // used by getFromExpr to support simpler expressions that look into the root model by default
     prefixExpr(key) {
-      if (key.startsWith('context.') || key.startsWith('model.') || key.startsWith('value.') || key.startsWith('modelRoot.') || key.startsWith('root.')) return key
+      if (key.startsWith('context.') || key.startsWith('model.') || key.startsWith('value.') || key.startsWith('modelRoot.') || key.startsWith('root.') || key.startsWith('parent.')) return key
       // no specific prefix found, we use modelRoot for retro-compatibility
       if (this.modelRoot) return 'root.' + key
       return 'model.' + key
@@ -396,7 +388,6 @@ export default {
     },
     input(value, initial = false, fastForward = true) {
       if (Array.isArray(value) && this.separator) value = value.join(this.separator)
-      // this.debug('input', JSON.stringify([this.value, value]))
       if (value === null || value === undefined || (value === '' && this.fullSchema.default !== '')) {
         if (this.fullSchema.nullable) {
           if (this.value !== null) {
@@ -440,7 +431,6 @@ export default {
       return null
     },
     fixProperties(value) {
-      this.debug('fixProperties')
       if (this.fullSchema.type !== 'object' || !value) return value
 
       const nonSchematized = (!this.fullSchema.properties || !this.fullSchema.properties.length) && (!Object.keys(this.subModels).length || !!this.fullSchema['x-fromData'] || !!this.fullSchema['x-fromUrl'])
@@ -472,7 +462,6 @@ export default {
       return value
     },
     initFromSchema() {
-      this.debug('initFromSchema')
       // initiallyDefined will by used in Validatable.js to perform initial validation or not
       this.initiallyDefined = this.value !== undefined && this.value !== null
       // we cannot consider empty objects and empty arrays as "defined" as they might have been initialized by vjsf itself

package/lib/mixins/EditableArray.js

@@ -12,11 +12,9 @@ export default {
   },
   computed: {
     isEditableArray() {
-      this.debug('compute isEditableArray')
       if (this.resolvedSchema.type === 'array' && this.resolvedSchema.items && this.resolvedSchema.items.type === 'object') return true
     },
     readonlyItemSchema() {
-      this.debug('compute readonlyItemSchema')
       if (!this.fullSchema || !this.fullSchema.items) return
 
       const schema = copy(this.fullSchema.items)
@@ -247,7 +245,6 @@ export default {
           } else {
             itemChild = this.renderArrayItemRO(h, item, i)
             itemKey = this.cached(`item-key-${i}`, { item }, () => {
-              this.debug('new RO item key', i)
               return `${i}-${new Date().getTime()}`
             })
             if (!this.fullOptions.disableSorting) {

package/lib/mixins/ObjectContainer.js

@@ -13,7 +13,6 @@ export default {
   },
   computed: {
     isObjectContainer() {
-      this.debug('compute isObjectContainer')
       if (!this.fullSchema) return
       if (this.fullSchema.type !== 'object' && !Array.isArray(this.fullSchema.items)) return false
       if (this.isSelectProp) return false
@@ -21,12 +20,10 @@ export default {
       return true
     },
     subSchemas() {
-      this.debug('compute subSchemas')
       if (!this.fullSchema) return
       return this.fullSchema.oneOf || this.fullSchema.anyOf
     },
     subSchemasConstProp() {
-      this.debug('compute subSchemasConstProp')
       if (!this.subSchemas) return
       const props = this.subSchemas[0].properties
       const key = Object.keys(props).find(p => !!props[p].const)
@@ -34,13 +31,11 @@ export default {
       return { ...props[key], key, htmlDescription: this.fullOptions.memMarkdown(props[key].description) }
     },
     subSchemasRequired() {
-      this.debug('compute subSchemasRequired')
       if (!this.subSchemas || !this.subSchemasConstProp) return false
       if (this.fullSchema.oneOf) return true
       if (this.fullSchema.anyOf && this.fullSchema.required && this.fullSchema.required.find(r => r === this.oneOfConstProp.key)) return true
     },
     subSchemasRules() {
-      this.debug('compute subSchemasRules')
       if (!this.fullSchema) return
       const rules = []
       if (this.subSchemasRequired) rules.push((val) => (val !== undefined && val !== null && val !== '') || this.fullOptions.messages.required)
@@ -49,7 +44,6 @@ export default {
   },
   watch: {
     currentOneOf(newVal, oldVal) {
-      this.debug('watched currentOneOf')
       // use this boolean to force removing then re-creating the object property
       // based on the currentOneOf sub schema. If we don't the component is reused and reactivity creates some difficult bugs.
       this.showCurrentOneOf = false
@@ -67,7 +61,6 @@ export default {
     },
     subModels: {
       handler() {
-        this.debug('watched subModels')
         this.input(this.fixProperties(this.value), false, false)
       },
       deep: true

package/lib/mixins/Validatable.js

@@ -9,7 +9,8 @@ export default {
       form: {
         register: this.register,
         unregister: this.unregister,
-        fastForwardEvent: this.fastForwardEvent
+        fastForwardEvent: this.fastForwardEvent,
+        getExprNode: this.getExprNode
       }
     }
   },
@@ -29,20 +30,16 @@ export default {
   },
   computed: {
     childrenInputs() {
-      this.debug('compute childrenInputs')
       return this.inputs.reduce((a, input, i) => { a[input.modelKey || i] = input; return a }, {})
     },
     hasError() {
-      this.debug('compute hasError')
       return !!this.inputs.find(input => input.hasError) || !!this.localRuleError
     },
     hasValidatedError() {
-      this.debug('compute hasValidatedError')
       return !!this.inputs.find(input => input.hasValidatedError || (input.hasError && (input.validated || input.shouldValidate))) ||
         (this.localRuleError && (this.validated || this.shouldValidate))
     },
     childrenWithValidatedErrors() {
-      this.debug('compute childrenWithValidatedErrors')
       return Object.keys(this.childrenInputs).filter(key => !!this.childrenInputs[key].hasValidatedError)
     },
     localRuleError() {
@@ -59,7 +56,6 @@ export default {
       // nextTick prevents some hard to debug infinite loops
       this.$nextTick(() => {
         if (!deepEqual(this.childrenWithValidatedErrors, this.dedupChildrenWithValidatedErrors)) {
-          this.debug('set dedupChildrenWithValidatedErrors', JSON.stringify(this.childrenWithValidatedErrors))
           this.dedupChildrenWithValidatedErrors = this.childrenWithValidatedErrors
         }
       })
@@ -73,12 +69,10 @@ export default {
   },
   methods: {
     register(input) {
-      this.debug('register', input.modelKey)
       if (this.validated) input.validate(true)
       this.inputs.push(input)
     },
     unregister(input) {
-      this.debug('unregister', input.modelKey)
       this.inputs = this.inputs.filter(i => i._uid !== input._uid)
     },
     validate(force) {
@@ -87,7 +81,6 @@ export default {
         valid: input.validate(force),
         key: input.modelKey || i
       }))
-      this.debug('validate children inputs', results)
       return !results.find(r => !r.valid)
     },
     reset() {
@@ -111,6 +104,15 @@ export default {
       // emit an event to the top of the vjsf instances tree exactly as it is
       if (this.fullKey === 'root') this.$emit(eventName, data)
       else this.form.fastForwardEvent(eventName, data)
+    },
+    getExprNode() {
+      const node = {
+        value: this.value,
+        key: this.modelKey,
+        fullKey: this.fullKey
+      }
+      if (this.form && this.form.getExprNode) node.parent = this.form.getExprNode()
+      return node
     }
   }
 }

package/lib/utils/select.js

@@ -61,7 +61,7 @@ const matchItem = (selectItem, item, itemKey) => {
 const missingValuesCache = []
 const fetchMissingValue = async (fullOptions, fullSchema, itemKey, fromUrl, value) => {
   const valueFromCache = missingValuesCache.find(cv => deepEqual(cv.key, [itemKey, fromUrl, value]))
-  if (valueFromCache) return valueFromCache.result
+  if (valueFromCache) return valueFromCache.result || value
   const rawItems = await selectUtils.fetchRawItems(fullOptions, fullSchema, fromUrl, value[itemKey])
   const result = rawItems.find(item => matchItem(item, value, itemKey))
   missingValuesCache.push({ key: [itemKey, fromUrl, value], result })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koumoul/vjsf",
-  "version": "2.9.0",
+  "version": "2.10.2",
   "description": "Generate forms for the vuetify UI library (vuejs) based on annotated JSON schemas.",
   "main": "dist/main.js",
   "scripts": {
@@ -46,38 +46,36 @@
   },
   "homepage": "https://github.com/koumoul-dev/vuetify-jsonschema-form#readme",
   "dependencies": {
-    "@mdi/js": "^5.5.55",
-    "ajv": "^8.6.2",
+    "@mdi/js": "^6.5.95",
+    "ajv": "^8.9.0",
     "ajv-formats": "^2.1.1",
-    "ajv-i18n": "^4.1.0",
-    "debounce": "^1.2.0",
+    "ajv-i18n": "^4.2.0",
+    "debounce": "^1.2.1",
+    "debug": "^4.3.3",
     "fast-copy": "^2.1.1",
-    "fast-equals": "^2.0.0",
-    "markdown-it": "^8.4.2",
-    "match-all": "^1.2.5",
-    "object-hash": "^2.1.1",
-    "property-expr": "^2.0.4",
+    "fast-equals": "^2.0.4",
+    "markdown-it": "^12.3.2",
+    "match-all": "^1.2.6",
+    "object-hash": "^2.2.0",
+    "property-expr": "^2.0.5",
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/core": "^7.16.12",
+    "@babel/preset-env": "^7.16.11",
     "@koumoul/data-fair-search-widget": "^0.3.0",
     "@koumoul/gh-pages-multi": "^0.6.0",
-    "@mdi/font": "^3.8.95",
-    "@nuxtjs/axios": "^5.9.0",
-    "@nuxtjs/vuetify": "^1.11.2",
+    "@mdi/font": "^6.5.95",
+    "@nuxtjs/axios": "^5.13.6",
+    "@nuxtjs/vuetify": "^1.12.3",
     "@toast-ui/vue-editor": "^2.5.1",
-    "@vue/test-utils": "^1.0.3",
-    "axios": "^0.21.1",
+    "@vue/test-utils": "^1.3.0",
+    "axios": "^0.25.0",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^10.0.2",
-    "babel-jest": "^26.1.0",
-    "babel-loader": "^8.0.6",
-    "babel-polyfill": "^6.26.0",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.2.3",
     "brace": "^0.11.1",
-    "easymde": "^2.14.0",
+    "easymde": "^2.16.1",
     "eslint": "^6.1.0",
     "eslint-config-standard": "^13.0.1",
     "eslint-plugin-import": "^2.18.2",
@@ -85,26 +83,23 @@
     "eslint-plugin-node": "^9.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
-    "eslint-plugin-vue": "^5.2.3",
-    "fuse.js": "^3.4.6",
-    "highlight.js": "^10.4.1",
-    "hjson": "^3.1.2",
+    "eslint-plugin-vue": "^7.20.0",
+    "highlight.js": "^11.4.0",
     "jest": "^26.1.0",
     "jest-serializer-vue": "^2.0.2",
-    "mini-css-extract-plugin": "^0.8.0",
-    "nuxt": "^2.13.1",
+    "mini-css-extract-plugin": "^1.6.2",
+    "nuxt": "^2.15.8",
     "random-words": "^1.1.0",
-    "sanitize-html": "^2.3.0",
+    "sanitize-html": "^2.6.1",
     "stringify-object": "^3.3.0",
     "tiptap-vuetify": "^2.24.0",
     "v-mask": "^2.3.0",
     "vue-axios": "^2.1.5",
     "vue-cropperjs": "^4.2.0",
-    "vue-jest": "^3.0.5",
-    "vue-template-compiler": "^2.6.11",
-    "vuetify": "^2.5.2",
-    "webpack": "^4.39.0",
-    "webpack-cli": "^3.3.6",
-    "yaml": "^1.7.1"
+    "vue-jest": "^3.0.7",
+    "vue-template-compiler": "^2.6.14",
+    "vuetify": "^2.6.2",
+    "webpack-cli": "^4.9.1",
+    "yaml": "^1.10.2"
   }
 }

package/webpack.config.js

@@ -1,5 +1,5 @@
 const path = require('path')
-const VueLoaderPlugin = require('vue-loader/lib/plugin')
+const { VueLoaderPlugin } = require('vue-loader')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 
 const base = {
@@ -8,22 +8,16 @@ const base = {
     rules: [{
       test: /\.js$/,
       exclude: /(node_modules)/,
-      loader: 'babel-loader',
-      options: {
-        presets: ['@babel/preset-env']
-      }
+      use: 'babel-loader'
     }, {
       test: /\.vue$/,
-      loader: 'vue-loader'
+      use: 'vue-loader'
     }, {
       test: /\.css$/,
-      loader: [MiniCssExtractPlugin.loader, 'css-loader']
-    }, {
-      test: /\.less$/,
-      loader: [MiniCssExtractPlugin.loader, 'css-loader', 'less-loader']
+      use: [MiniCssExtractPlugin.loader, 'css-loader']
     }, {
       test: /\.(svg|eot|woff|ttf|woff2)$/,
-      loader: ['file-loader']
+      use: 'file-loader'
     }]
   },
   plugins: [