@amritk/generate-examples 0.6.3 → 0.6.4

package/dist/generators/derive-example.js

@@ -1,4 +1,5 @@
 import { getMjstInstanceOf, getMjstPrimitive } from "@amritk/helpers/mjst-extension";
+import { readKey } from "@amritk/helpers/read-key";
 import { resolveRef } from "@amritk/helpers/resolve-ref";
 import { hasAdditionalProperties, hasAllOf, hasAnyOf, hasConst, hasDefault, hasDependentRequired, hasDependentSchemas, hasEnum, hasExamples, hasExclusiveMaximum, hasExclusiveMinimum, hasFormat, hasItems, hasMaxItems, hasMaximum, hasMaxLength, hasMaxProperties, hasMinItems, hasMinimum, hasMinLength, hasMinProperties, hasMultipleOf, hasOneOf, hasPattern, hasPatternProperties, hasProperties, hasPropertyNames, hasRef, hasRequired, hasType, hasUniqueItems, isSchemaObject } from "@amritk/helpers/schema-guards";
 import { makeInstanceCheck, needsValidationFilter } from "./schema-validation.js";
@@ -67,6 +68,13 @@ const topLevelAlternatives = (s) => {
   parts.push(cur);
   return parts;
 };
+const matchesPattern = (pattern, value) => {
+  try {
+    return new RegExp(pattern).test(value);
+  } catch {
+    return false;
+  }
+};
 const sampleFromPattern = (pattern, minLength) => {
   let body = pattern;
   if (body.startsWith("^"))
@@ -180,14 +188,14 @@ const FORMAT_EXAMPLES = {
 };
 const exampleString = (schema) => {
   if (hasFormat(schema)) {
-    const formatted = FORMAT_EXAMPLES[schema.format];
+    const formatted = readKey(FORMAT_EXAMPLES, schema.format);
     if (formatted !== void 0)
       return formatted;
   }
   const minLength = hasMinLength(schema) ? schema.minLength : 0;
   if (hasPattern(schema)) {
     const sampled = sampleFromPattern(schema.pattern, minLength);
-    if (sampled !== void 0 && sampled.length >= minLength && new RegExp(schema.pattern).test(sampled)) {
+    if (sampled !== void 0 && sampled.length >= minLength && matchesPattern(schema.pattern, sampled)) {
       if (!(hasMaxLength(schema) && sampled.length > schema.maxLength))
         return sampled;
     }

package/dist/generators/schema-validation.js

@@ -16,23 +16,47 @@ const FILTER_KEYWORDS = /* @__PURE__ */ new Set([
   "maxProperties",
   "contains"
 ]);
-const SKIP_RECURSE = /* @__PURE__ */ new Set(["enum", "const", "examples", "default", "$ref", "required", "$defs", "definitions"]);
+const SCHEMA_MAPS = /* @__PURE__ */ new Set([
+  "properties",
+  "patternProperties",
+  "$defs",
+  "definitions",
+  "dependentSchemas",
+  "dependencies"
+]);
+const SKIP_RECURSE = /* @__PURE__ */ new Set([
+  // The data keywords, matching `@amritk/helpers`' `DATA_KEYWORDS` —
+  // `example` is OpenAPI 3.0's singular spelling and belongs with `examples`.
+  "enum",
+  "const",
+  "examples",
+  "example",
+  "default",
+  // Plus this walker's own additions, which are not data but are equally not
+  // applied here.
+  "$ref",
+  "required",
+  "$defs",
+  "definitions"
+]);
 const filterAnswers = /* @__PURE__ */ new WeakMap();
 const needsValidationFilter = (schema) => {
-  const walk = (node) => {
+  const walk = (node, inSchemaMap = false) => {
     if (Array.isArray(node))
-      return node.some(walk);
+      return node.some((item) => walk(item, inSchemaMap));
     if (node === null || typeof node !== "object")
       return false;
     const obj = node;
-    for (const key of Object.keys(obj)) {
-      if (FILTER_KEYWORDS.has(key))
-        return true;
+    if (!inSchemaMap) {
+      for (const key of Object.keys(obj)) {
+        if (FILTER_KEYWORDS.has(key))
+          return true;
+      }
     }
-    for (const [key, value] of Object.entries(obj)) {
-      if (SKIP_RECURSE.has(key))
+    for (const key of Object.keys(obj)) {
+      if (!inSchemaMap && SKIP_RECURSE.has(key))
         continue;
-      if (walk(value))
+      if (walk(obj[key], !inSchemaMap && SCHEMA_MAPS.has(key)))
         return true;
     }
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amritk/generate-examples",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Generate fast-check arbitraries and example values from JSON Schemas.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -55,8 +55,8 @@
   },
   "dependencies": {
     "json-schema-typed": "^8.0.1",
-    "@amritk/helpers": "^0.15.3",
-    "@amritk/runtime-validators": "^0.10.1"
+    "@amritk/helpers": "^0.15.4",
+    "@amritk/runtime-validators": "^0.11.0"
   },
   "devDependencies": {
     "ajv": "^8.17.1"