@lionweb/validation 0.7.0-beta.10 → 0.7.0-beta.11

package/src/validators/ValidationFunctions.ts

@@ -20,7 +20,6 @@ import { PropertyDefinition } from "./generic/schema/ValidationTypes.js"
  * @param result    Any validation issues found will be put into this object.
  * @param context   The context for the error message in errors.
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateId<String>(value: String, result: ValidationResult, context: JsonContext): void {
     const idString: string = "" + value
     const regexp = /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*$/
@@ -35,7 +34,6 @@ export function validateId<String>(value: String, result: ValidationResult, cont
  * @param result    Any validation issues found will be put into this object.
  * @param context   The context for the error message in errors.
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateKey<String>(value: String, result: ValidationResult, context: JsonContext): void {
     const keyString: string = "" + value
     const regexp = /^[a-zA-Z0-9_-][a-zA-Z0-9_-]*$/
@@ -50,7 +48,6 @@ export function validateKey<String>(value: String, result: ValidationResult, con
  * @param result    Any validation issues found will be put into this object.
  * @param context   The location in the overall JSON.
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateVersion<String>(value: String, result: ValidationResult, context: JsonContext): void {
     const versionString: string = "" + value
     if (versionString.length === 0) {
@@ -65,7 +62,6 @@ export function validateVersion<String>(value: String, result: ValidationResult,
  * @param context   The location in the overall JSON.
  * @param propDef   The PropertyDefinition for this value
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateBoolean<String>(value: String, result: ValidationResult, context: JsonContext, propDef?: PropertyDefinition): void {
     const valueAsPrimitive = "" + value
     if (valueAsPrimitive !== "true" && valueAsPrimitive !== "false") {
@@ -87,7 +83,6 @@ export function validateBoolean<String>(value: String, result: ValidationResult,
  * @param context   The location in the overall JSON.
  * @param propDef   The PropertyDefinition for this value
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateInteger<String>(value: String, result: ValidationResult, context: JsonContext, propDef?: PropertyDefinition): void {
     const valueAsPrimitive = "" + value
     const regexp = /^[+-]?(0|[1-9][0-9]*)$/
@@ -103,7 +98,6 @@ export function validateInteger<String>(value: String, result: ValidationResult,
  * @param context   The location in the overall JSON.
  * @param propDef   The PropertyDefinition for this value
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateJSON<String>(value: String, result: ValidationResult, context: JsonContext, propDef?: PropertyDefinition): void {
     const valueAsPrimitive = "" + value
     if (value === null) {
@@ -111,7 +105,7 @@ export function validateJSON<String>(value: String, result: ValidationResult, co
     }
     try {
         JSON.parse(valueAsPrimitive)
-    } catch (e) {
+    } catch (_) {
         result.issue(new Language_PropertyValue_Issue(context, propDef ? propDef.name : "unknown", valueAsPrimitive, "JSON"))
     }
 }
@@ -122,7 +116,6 @@ export function validateJSON<String>(value: String, result: ValidationResult, co
  * @param result
  * @param context
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function validateSerializationFormatVersion<String>(value: String, result: ValidationResult, context: JsonContext): void {
     if (typeof value !== "string") {
         result.issue(new Syntax_SerializationFormatVersion_Issue(context, JSON.stringify(value)))

package/src/validators/generic/SyntaxValidator.ts

@@ -62,11 +62,6 @@ export class SyntaxValidator {
             return
         }
         for (const propertyDef of typeDef.properties) {
-            // const taggedUnion = this.schema.getTaggedUnionDefinition(propertyDef.type)
-            // if (taggedUnion !== undefined) {
-            //     this.validateTaggedUnion(propertyDef, typeDef, object, jsonContext.concat(propertyDef.name))
-            //     continue
-            // }
             const expectedTypeDef = this.schema.getDefinition(propertyDef.type)
             const validator = propertyDef.validate!
             const propertyValue = object[propertyDef.name]
@@ -151,53 +146,6 @@ export class SyntaxValidator {
         return true
     }
 
-    /**
-     *
-     * @param propertyDef the definition of the property that has the TaggedUnionType as its type
-     * @param typeDef The object definition containing the `propertyDef`
-     * @param object The object of type `typeDef` that should have the property described by `propertyDef`
-     * @param jsonContext
-     */
-    // validateTaggedUnion(
-    //     propertyDef: PropertyDefinition,
-    //     typeDef: ObjectDefinition,
-    //     object: UnknownObjectType,
-    //     jsonContext: JsonContext
-    // ): void {
-    //     // console.log(`validateTaggedUnion ${JSON.stringify(propertyDef)}, typedef ${typeDef.name}  object: ${JSON.stringify(object, null, 3)}`)
-    //     const taggedObject = object[propertyDef.name]
-    //     if (propertyDef.isList) {
-    //         if (!Array.isArray(taggedObject)) {
-    //             this.validationResult.issue(new GenericIssue(jsonContext, `Property value '${propertyDef.name}' expects an array, found '${typeof taggedObject}'`))
-    //         } else {
-    //             taggedObject.forEach((taggedObjectSingle, index) => {
-    //                 this.validateTaggedObject(taggedObjectSingle, jsonContext.concat(index))
-    //             })
-    //         }
-    //     } else {
-    //         if (!(typeof taggedObject === "object")) {
-    //             this.validationResult.issue(new GenericIssue(jsonContext, `Property value '${propertyDef.name}' expects an object, found '${typeof taggedObject}'`))
-    //         } else {
-    //             this.validateTaggedObject(taggedObject as UnknownObjectType, jsonContext)
-    //         }
-    //     }
-    // }
-
-    /**
-     * Validate a single tagged object
-     * @param taggedObject
-     * @param jsonContext
-     */
-    // validateTaggedObject(taggedObject: UnknownObjectType, jsonContext: JsonContext): void {
-    //     const actualTypeName = taggedObject["messageKind"] as string
-    //     const actualType = this.schema.getDefinition(actualTypeName)
-    //     if (actualType === undefined || !isObjectDefinition(actualType)) {
-    //         this.validationResult.issue(new GenericIssue(jsonContext, `Expected object type is ${typeof taggedObject}, should be object`))
-    //     } else {
-    //         this.validateObjectProperties(actualTypeName, actualType, taggedObject, jsonContext)
-    //     }
-    // }
-
     /**
      * Check whether there are extra properties that should not be there.
      * @param obj           Object to be validated