schema-markdown 1.2.8 → 1.2.10

package/lib/parser.js

@@ -7,7 +7,8 @@ import {validateTypeModelErrors} from './schemaUtil.js';
 
 
 // Built-in types
-const builtinTypes = new Set(['bool', 'date', 'datetime', 'float', 'int', 'object', 'string', 'uuid']);
+const builtinTypes = new Set(['any', 'bool', 'date', 'datetime', 'float', 'int', 'string', 'uuid']);
+const builtinDeprecated = {'object': 'any'};
 
 
 // Schema Markdown regex
@@ -213,7 +214,7 @@ export function parseSchemaMarkdown(text, {types = {}, filename = '', validate =
             const definitionBaseIds = match.groups.baseIds;
 
             // Type already defined?
-            if (builtinTypes.has(definitionId) || definitionId in types) {
+            if (builtinTypes.has(definitionId) || definitionId in builtinDeprecated || definitionId in types) {
                 addError(`Redefinition of type '${definitionId}'`, filename, linenum);
             }
 
@@ -391,7 +392,7 @@ export function parseSchemaMarkdown(text, {types = {}, filename = '', validate =
             const definitionId = match.groups.id;
 
             // Type already defined?
-            if (builtinTypes.has(definitionId) || definitionId in types) {
+            if (builtinTypes.has(definitionId) || definitionId in builtinDeprecated || definitionId in types) {
                 addError(`Redefinition of type '${definitionId}'`, filename, linenum);
             }
 
@@ -514,6 +515,9 @@ function parseTypedef(matchTypedef) {
 
 // Helper function to create a type model
 function createType(typeName) {
+    if (typeName in builtinDeprecated) {
+        return {'builtin': builtinDeprecated[typeName]};
+    }
     if (builtinTypes.has(typeName)) {
         return {'builtin': typeName};
     }

package/lib/schema.js

@@ -136,7 +136,7 @@ export function validateType(types, typeName, value, memberFqn = null) {
 
 
 // Regular expressions used by validateTypeHelper
-const rDate = /^\d{4}-\d{2}-\d{2}$/;
+const rDate = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/;
 const rDatetime = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?(?:Z|[+-]\d{2}:\d{2})$/;
 
 
@@ -200,9 +200,12 @@ function validateTypeHelper(types, type, value, memberFqn) {
             // Convert string?
             if (typeof value === 'string') {
                 // Valid date format?
-                if (rDate.test(value)) {
-                    const localDate = new Date(value);
-                    valueNew = new Date(localDate.getUTCFullYear(), localDate.getUTCMonth(), localDate.getUTCDate());
+                const mDate = value.match(rDate);
+                if (mDate !== null) {
+                    const year = Number.parseInt(mDate.groups.year, 10);
+                    const month = Number.parseInt(mDate.groups.month, 10);
+                    const day = Number.parseInt(mDate.groups.day, 10);
+                    valueNew = new Date(year, month - 1, day);
                 } else if (rDatetime.test(value)) {
                     valueNew = new Date(value);
                 } else {
@@ -216,7 +219,7 @@ function validateTypeHelper(types, type, value, memberFqn) {
 
             // For date type, clear hours, minutes, seconds, and milliseconds
             if (builtin === 'date') {
-                valueNew = new Date(valueNew.getFullYear(), valueNew.getMonth(), valueNew.getUTCDate());
+                valueNew = new Date(valueNew.getFullYear(), valueNew.getMonth(), valueNew.getDate());
             }
         }
 

package/lib/schemaUtil.js

@@ -57,7 +57,7 @@ export function validateTypeModelErrors(types) {
                     // Check member type and attributes
                     validateTypeModelType(errors, types, member.type, 'attr' in member ? member.attr : null, struct.name, member.name);
                 }
-            } catch (TypeError) {
+            } catch {
                 errors.push([typeName, null, `Circular base type detected for type '${typeName}'`]);
             }
 
@@ -93,7 +93,7 @@ export function validateTypeModelErrors(types) {
                         errors.push([typeName, valueName, `Redefinition of '${typeName}' value '${valueName}'`]);
                     }
                 }
-            } catch (TypeError) {
+            } catch {
                 errors.push([typeName, null, `Circular base type detected for type '${typeName}'`]);
             }
 
@@ -147,7 +147,7 @@ export function validateTypeModelErrors(types) {
                                     }
                                     memberSections[memberName].push(sectionStruct.name);
                                 }
-                            } catch (TypeError) {
+                            } catch {
                                 // Do nothing
                             }
                         }

package/lib/typeModel.js

@@ -91,8 +91,8 @@ enum BuiltinType
     # A UUID formatted as string
     uuid
 
-    # An object of any type
-    object
+    # An value of any type
+    any
 
 
 # An array type

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "schema-markdown",
-    "version": "1.2.8",
+    "version": "1.2.10",
     "description": "A schema definition and validation library",
     "keywords": [
         "schema",
@@ -24,8 +24,8 @@
         "test": "node --test test/"
     },
     "devDependencies": {
-        "c8": "~7.13",
-        "eslint": "~8.40",
+        "c8": "~10.1",
+        "eslint": "~9.14",
         "jsdoc": "~4.0"
     }
 }