schema-markdown 1.1.3 → 1.1.6

package/lib/parser.js

@@ -3,7 +3,7 @@
 
 /** @module lib/parser */
 
-import {validateTypeModelTypesErrors} from './schemaUtil.js';
+import {validateTypeModelErrors} from './schemaUtil.js';
 
 /* eslint-disable prefer-template */
 
@@ -43,7 +43,7 @@ const RE_PART_TYPEDEF =
 const RE_TYPEDEF = new RegExp('^typedef\\s+' + RE_PART_TYPEDEF + '\\s*$');
 const RE_MEMBER = new RegExp('^\\s+(?<optional>optional\\s+)?' + RE_PART_TYPEDEF + '\\s*$');
 const RE_VALUE = new RegExp('^\\s+(?<id>' + RE_PART_ID + ')\\s*$');
-const RE_VALUE_QUOTED = new RegExp('^\\s+"(?<id>' + RE_PART_ID + '.*?)"\\s*$');
+const RE_VALUE_QUOTED = /^\s+"(?<id>.*?)"\s*$/;
 const RE_URL = /^\s+(?<method>[A-Za-z]+|\*)(?:\s+(?<path>\/[^\s]*))?/;
 
 
@@ -244,7 +244,7 @@ export class SchemaMarkdownParser {
      */
     finalize() {
         // Do the finalization
-        for (const [typeName, memberName, errorMsg] of validateTypeModelTypesErrors(this.types)) {
+        for (const [typeName, memberName, errorMsg] of validateTypeModelErrors(this.types)) {
             this.addError(errorMsg, ...this.getFilepos(typeName, memberName));
         }
 
@@ -321,38 +321,46 @@ export class SchemaMarkdownParser {
                 }
 
                 // Match syntax
-                let [matchName, match] = ['comment', line.match(RE_COMMENT)];
+                let matchName = 'comment';
+                let match = line.match(RE_COMMENT);
                 if (match === null) {
-                    [matchName, match] = ['group', line.match(RE_GROUP)];
+                    matchName = 'group';
+                    match = line.match(RE_GROUP);
                 }
                 if (match === null) {
-                    [matchName, match] = ['action', line.match(RE_ACTION)];
+                    matchName = 'action';
+                    match = line.match(RE_ACTION);
                 }
                 if (match === null) {
-                    [matchName, match] = ['definition', line.match(RE_DEFINITION)];
+                    matchName = 'definition';
+                    match = line.match(RE_DEFINITION);
                 }
                 if (match === null && action !== null) {
-                    [matchName, match] = ['section', line.match(RE_SECTION)];
+                    matchName = 'section';
+                    match = line.match(RE_SECTION);
                 }
                 if (match === null && action !== null) {
-                    [matchName, match] = ['section_plain', line.match(RE_SECTION_PLAIN)];
+                    matchName = 'section_plain';
+                    match = line.match(RE_SECTION_PLAIN);
                 }
                 if (match === null && userType !== null && 'enum' in userType) {
-                    const matchValue = line.match(RE_VALUE);
-                    if (matchValue !== null) {
-                        [matchName, match] = ['value', matchValue];
-                    } else {
-                        [matchName, match] = ['value', line.match(RE_VALUE_QUOTED)];
+                    matchName = 'value';
+                    match = line.match(RE_VALUE);
+                    if (match === null) {
+                        match = line.match(RE_VALUE_QUOTED);
                     }
                 }
                 if (match === null && userType !== null && 'struct' in userType) {
-                    [matchName, match] = ['member', line.match(RE_MEMBER)];
+                    matchName = 'member';
+                    match = line.match(RE_MEMBER);
                 }
                 if (match === null && urls !== null) {
-                    [matchName, match] = ['urls', line.match(RE_URL)];
+                    matchName = 'urls';
+                    match = line.match(RE_URL);
                 }
                 if (match === null) {
-                    [matchName, match] = ['typedef', line.match(RE_TYPEDEF)];
+                    matchName = 'typedef';
+                    match = line.match(RE_TYPEDEF);
                 }
                 if (match === null) {
                     matchName = null;

package/lib/schema.js

@@ -4,7 +4,7 @@
 /** @module lib/schema */
 
 import {typeModel} from './typeModel.js';
-import {validateTypeModelTypesErrors} from './schemaUtil.js';
+import {validateTypeModelErrors} from './schemaUtil.js';
 
 
 /**
@@ -20,7 +20,6 @@ export function getReferencedTypes(types, typeName, referencedTypes = {}) {
 }
 
 
-// eslint-disable-next-line no-unused-vars
 function getReferencedTypesHelper(types, type, referencedTypes) {
     // Array?
     if ('array' in type) {
@@ -517,36 +516,15 @@ export function getEnumValues(types, enum_) {
  * @returns {Object} The validated, transformed types object
  * @throws {ValidationError} A validation error occurred
  */
-export function validateTypeModelTypes(types) {
+export function validateTypeModel(types) {
     // Validate with the type model
-    const validatedTypes = validateType(typeModel.types, 'Types', types);
+    const validatedTypes = validateType(typeModel, 'Types', types);
 
     // Do additional type model validation
-    const errors = validateTypeModelTypesErrors(validatedTypes);
+    const errors = validateTypeModelErrors(validatedTypes);
     if (errors.length) {
         throw new ValidationError(errors.map(([,, message]) => message).join('\n'));
     }
 
     return validatedTypes;
 }
-
-
-/**
- * Validate a user type model
- *
- * @param {Object} userTypeModel - The user type model
- * @returns {Object} The validated, transformed type model
- * @throws {ValidationError} A validation error occurred
- */
-export function validateTypeModel(userTypeModel) {
-    // Validate with the type model
-    const validatedUserTypeModel = validateType(typeModel.types, 'TypeModel', userTypeModel);
-
-    // Do additional type model validation
-    const errors = validateTypeModelTypesErrors(validatedUserTypeModel.types);
-    if (errors.length) {
-        throw new ValidationError(errors.map(([,, message]) => message).join('\n'));
-    }
-
-    return validatedUserTypeModel;
-}

package/lib/schemaUtil.js

@@ -10,7 +10,7 @@
  *
  * @ignore
  */
-export function validateTypeModelTypesErrors(types) {
+export function validateTypeModelErrors(types) {
     const errors = [];
 
     // Check each user type

package/lib/typeModel.js

@@ -8,16 +8,6 @@ import {SchemaMarkdownParser} from './parser.js';
 
 // The Schema Markdown type model defined as Schema Markdown
 const typeModelSmd = `\
-# A type model with a title
-struct TypeModel
-
-    # The type model's title
-    string title
-
-    # The type model
-    Types types
-
-
 # Map of user type name to user type model
 typedef UserType{len > 0} Types
 
@@ -256,7 +246,4 @@ struct ActionURL
 /**
  * The Schema Markdown type model
  */
-export const typeModel = {
-    'title': 'The Schema Markdown Type Model',
-    'types': (new SchemaMarkdownParser(typeModelSmd)).types
-};
+export const typeModel = (new SchemaMarkdownParser(typeModelSmd)).types;

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "schema-markdown",
-    "version": "1.1.3",
+    "version": "1.1.6",
     "description": "Human-friendly schema definition language and schema validator",
     "keywords": [
         "schema",
@@ -24,9 +24,9 @@
         "test": "ava -v test/"
     },
     "devDependencies": {
-        "ava": "^4.0.0-rc.1",
-        "c8": "~7.10",
-        "eslint": "~8.4",
+        "ava": "~4.2",
+        "c8": "~7.11",
+        "eslint": "~8.14",
         "jsdoc": "~3.6",
         "jsdom": "~19.0"
     }