jtcsv 2.1.5 → 2.2.2

package/stream-csv-to-json.js

@@ -20,6 +20,9 @@ const {
 const { Transform, Writable } = require('stream');
 const { pipeline } = require('stream/promises');
 
+// Import schema validator from utils
+const { createSchemaValidators } = require('./src/utils/schema-validator');
+
 /**
  * Creates a transform stream that converts CSV chunks to JSON objects
  * 
@@ -500,90 +503,6 @@ async function createCsvFileToJsonStream(filePath, options = {}) {
   }, 'FILE_STREAM_ERROR', { function: 'createCsvFileToJsonStream' });
 }
 
-/**
- * Creates schema validators from JSON schema
- * 
- * @private
- * @param {Object} schema - JSON schema
- * @returns {Object} Validators object
- */
-function createSchemaValidators(schema) {
-  const validators = {};
-  
-  if (!schema.properties) {
-    return validators;
-  }
-  
-  for (const [key, definition] of Object.entries(schema.properties)) {
-    const validator = {
-      type: definition.type,
-      required: schema.required && schema.required.includes(key)
-    };
-    
-    // Add format function for dates
-    if (definition.type === 'string' && definition.format === 'date-time') {
-      validator.format = (value) => {
-        if (value instanceof Date) {
-          return value.toISOString();
-        }
-        /* istanbul ignore next */
-        if (typeof value === 'string') {
-          // Try to parse as date
-          const date = new Date(value);
-          if (!isNaN(date.getTime())) {
-            return date.toISOString();
-          }
-        }
-        return value;
-      };
-    }
-    
-    // Add validation function
-    validator.validate = (value) => {
-      if (value === null || value === undefined) {
-        return !validator.required;
-      }
-      
-      // Type validation
-      if (definition.type === 'string' && typeof value !== 'string') {
-        return false;
-      }
-      if (definition.type === 'number' && typeof value !== 'number') {
-        return false;
-      }
-      if (definition.type === 'integer' && (!Number.isInteger(value) || typeof value !== 'number')) {
-        return false;
-      }
-      if (definition.type === 'boolean' && typeof value !== 'boolean') {
-        return false;
-      }
-      
-      // Additional constraints
-      if (definition.minimum !== undefined && value < definition.minimum) {
-        return false;
-      }
-      if (definition.maximum !== undefined && value > definition.maximum) {
-        return false;
-      }
-      if (definition.minLength !== undefined && value.length < definition.minLength) {
-        return false;
-      }
-      if (definition.maxLength !== undefined && value.length > definition.maxLength) {
-        return false;
-      }
-      if (definition.pattern && !new RegExp(definition.pattern).test(value)) {
-        return false;
-      }
-      
-      return true;
-    };
-    
-    validators[key] = validator;
-  }
-  
-  return validators;
-}
-
 /**
  * Creates a writable stream that collects JSON objects into an array
  * 
@@ -611,12 +530,13 @@ module.exports = {
   createCsvToJsonStream,
   streamCsvToJson,
   createCsvFileToJsonStream,
-  createJsonCollectorStream,
-  createSchemaValidators
+  createJsonCollectorStream
+  // Note: createSchemaValidators is no longer exported from here
+  // It should be imported directly from './src/utils/schema-validator'
 };
 
 // For ES6 module compatibility
 /* istanbul ignore next */
 if (typeof module !== 'undefined' && module.exports) {
   module.exports.default = createCsvToJsonStream;
-}
+}

package/stream-json-to-csv.js

@@ -18,6 +18,9 @@ const {
 const { Transform, Readable, Writable } = require('stream');
 const { pipeline } = require('stream/promises');
 
+// Import schema validator from utils
+const { createSchemaValidators } = require('./src/utils/schema-validator');
+
 /**
  * Creates a transform stream that converts JSON objects to CSV rows
  * 
@@ -291,90 +294,6 @@ function createJsonToCsvStream(options = {}) {
   }, 'STREAM_CREATION_ERROR', { function: 'createJsonToCsvStream' });
 }
 
-/**
- * Creates schema validators from JSON schema
- * 
- * @private
- * @param {Object} schema - JSON schema
- * @returns {Object} Validators object
- */
-function createSchemaValidators(schema) {
-  const validators = {};
-  
-  if (!schema.properties) {
-    return validators;
-  }
-  
-  for (const [key, definition] of Object.entries(schema.properties)) {
-    const validator = {
-      type: definition.type,
-      required: schema.required && schema.required.includes(key)
-    };
-    
-    // Add format function for dates
-    if (definition.type === 'string' && definition.format === 'date-time') {
-      validator.format = (value) => {
-        if (value instanceof Date) {
-          return value.toISOString();
-        }
-        /* istanbul ignore next */
-        if (typeof value === 'string') {
-          // Try to parse as date
-          const date = new Date(value);
-          if (!isNaN(date.getTime())) {
-            return date.toISOString();
-          }
-        }
-        return value;
-      };
-    }
-    
-    // Add validation function
-    validator.validate = (value) => {
-      if (value === null || value === undefined) {
-        return !validator.required;
-      }
-      
-      // Type validation
-      if (definition.type === 'string' && typeof value !== 'string') {
-        return false;
-      }
-      if (definition.type === 'number' && typeof value !== 'number') {
-        return false;
-      }
-      if (definition.type === 'integer' && (!Number.isInteger(value) || typeof value !== 'number')) {
-        return false;
-      }
-      if (definition.type === 'boolean' && typeof value !== 'boolean') {
-        return false;
-      }
-      
-      // Additional constraints
-      if (definition.minimum !== undefined && value < definition.minimum) {
-        return false;
-      }
-      if (definition.maximum !== undefined && value > definition.maximum) {
-        return false;
-      }
-      if (definition.minLength !== undefined && value.length < definition.minLength) {
-        return false;
-      }
-      if (definition.maxLength !== undefined && value.length > definition.maxLength) {
-        return false;
-      }
-      if (definition.pattern && !new RegExp(definition.pattern).test(value)) {
-        return false;
-      }
-      
-      return true;
-    };
-    
-    validators[key] = validator;
-  }
-  
-  return validators;
-}
-
 /**
  * Converts a readable stream of JSON objects to CSV and writes to a writable stream
  * 
@@ -533,12 +452,13 @@ module.exports = {
   streamJsonToCsv,
   saveJsonStreamAsCsv,
   createJsonReadableStream,
-  createCsvCollectorStream,
-  createSchemaValidators
+  createCsvCollectorStream
+  // Note: createSchemaValidators is no longer exported from here
+  // It should be imported directly from './src/utils/schema-validator'
 };
 
 // For ES6 module compatibility
 /* istanbul ignore next */
 if (typeof module !== 'undefined' && module.exports) {
   module.exports.default = createJsonToCsvStream;
-}
+}