@xyd-js/openapi-sampler 0.0.0-build-6675456-20251014012658 → 0.0.0-build-e4644f3-20251015210712

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @xyd-js/openapi-sampler
 
-## 0.0.0-build-6675456-20251014012658
+## 0.0.0-build-e4644f3-20251015210712
 
 ### Patch Changes
 

package/dist/index.js

@@ -1,3 +1,5 @@
+const SKIP_SYMBOL = Symbol('skip');
+
 function pad(number) {
   if (number < 10) {
     return '0' + number;
@@ -153,7 +155,10 @@ function allOfSample(into, children, options, spec, context) {
   const subSamples = [];
 
   for (let subSchema of children) {
-    const { type, readOnly, writeOnly, value } = traverse({ type: res.type, ...subSchema }, options, spec, context);
+    const { type, readOnly, writeOnly, value } = traverse({ type: res.type, ...subSchema }, options, spec, {
+      ...context,
+      isAllOfChild: true,
+    });
     if (res.type && type && type !== res.type) {
       console.warn('allOf: schemas with different types can\'t be merged');
       res.type = type;
@@ -166,6 +171,11 @@ function allOfSample(into, children, options, spec, context) {
 
   if (res.type === 'object') {
     res.value = mergeDeep(res.value || {}, ...subSamples.filter(sample => typeof sample === 'object'));
+    for (const key in res.value) {
+      if (res.value[key] === SKIP_SYMBOL) {
+        delete res.value[key];
+      }
+    }
     return res;
   } else {
     if (res.type === 'array') {
@@ -782,10 +792,16 @@ function sampleObject(schema, options = {}, spec, context) {
 
       const sample = traverse(schema.properties[propertyName], options, spec, { propertyName, depth: depth + 1 });
       if (options.skipReadOnly && sample.readOnly) {
+        if (context?.isAllOfChild) {
+          res[propertyName] = SKIP_SYMBOL;
+        }
         return;
       }
 
       if (options.skipWriteOnly && sample.writeOnly) {
+        if (context?.isAllOfChild) {
+          res[propertyName] = SKIP_SYMBOL;
+        }
         return;
       }
 
@@ -1018,7 +1034,9 @@ function regexSample$1(pattern) {
     pattern = pattern.toString();
     pattern = pattern.match(/\/(.+?)\//)?.[1] ?? ''; // Remove frontslash from front and back of RegExp
   }
-
+  
+  pattern = pattern.replace(/^(\^)?(.*?)(\$)?$/, '$2'); // Remove anchors if present
+  
   let min;
   let max;
   let repetitions;