@amritk/generate-parsers 0.7.1 → 0.7.2

package/dist/generators/generate-parser-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-parser-function.d.ts","sourceRoot":"","sources":["../../src/generators/generate-parser-function.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAMjE;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAChC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B,CAAA;AAqqCD;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,WACzB,UAAU,YACR,MAAM,YACN,qBAAqB,KAC9B,MAEF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,MAAsC,CAAA;AAEpG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,WACzB,UAAU,YACR,MAAM,iBACD,OAAO,sBAErB,MAyDF,CAAA"}
+{"version":3,"file":"generate-parser-function.d.ts","sourceRoot":"","sources":["../../src/generators/generate-parser-function.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAMjE;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;IAChC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;IACzB;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B,CAAA;AA4pCD;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,WACzB,UAAU,YACR,MAAM,YACN,qBAAqB,KAC9B,MAEF,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,MAAsC,CAAA;AAEpG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,WACzB,UAAU,YACR,MAAM,iBACD,OAAO,sBAErB,MAyDF,CAAA"}

package/dist/generators/generate-parser-function.js

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern';
 import { refToName } from '@amritk/helpers/ref-to-name';
 import { safeAccessor, safeKey } from '@amritk/helpers/safe-accessor';
 import { hasAllOf, hasAnyOf, hasConst, hasDefault, hasEnum, hasExamples, hasExclusiveMaximum, hasExclusiveMinimum, hasItems, hasMaxItems, hasMaximum, hasMaxLength, hasMinItems, hasMinimum, hasMinLength, hasMultipleOf, hasOneOf, hasPattern, hasProperties, hasRef, hasType, hasUniqueItems, isObjectSchema, isSchemaObject, } from '@amritk/helpers/schema-guards';
@@ -742,14 +743,6 @@ const generateInlineValueParser = (schema) => {
             return null;
     }
 };
-/**
- * Escapes special regex characters in a pattern string for use in a regex literal.
- * This escapes backslashes and forward slashes for safe inclusion in /pattern/ syntax.
- */
-const escapeRegexPattern = (pattern) => {
-    // Escape backslashes first, then forward slashes
-    return pattern.replace(/\\/g, '\\\\').replace(/\//g, '\\/');
-};
 /**
  * Generates a parser for schemas with patternProperties.
  * Handles both patternProperties and specification-extensions (x- prefix).

package/dist/generators/generate-schema-checks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-schema-checks.d.ts","sourceRoot":"","sources":["../../src/generators/generate-schema-checks.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAIjE;;GAEG;AACH,eAAO,MAAM,oBAAoB,aAAc,MAAM,UAAU,UAAU,KAAG,MAAM,EAkGjF,CAAA"}
+{"version":3,"file":"generate-schema-checks.d.ts","sourceRoot":"","sources":["../../src/generators/generate-schema-checks.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAIjE;;GAEG;AACH,eAAO,MAAM,oBAAoB,aAAc,MAAM,UAAU,UAAU,KAAG,MAAM,EAkGjF,CAAA"}

package/dist/generators/generate-schema-checks.js

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern';
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension';
 import { hasAdditionalProperties, hasEnum, hasExclusiveMaximum, hasExclusiveMinimum, hasMaxItems, hasMaximum, hasMaxLength, hasMaxProperties, hasMinItems, hasMinimum, hasMinLength, hasMinProperties, hasMultipleOf, hasPattern, hasProperties, hasRequired, hasType, hasUniqueItems, } from '@amritk/helpers/schema-guards';
 import { generateEnumCheck } from './generate-enum-check.js';
@@ -23,7 +24,7 @@ export const generateSchemaChecks = (accessor, schema) => {
         case 'string': {
             checks.push(`typeof ${accessor} === "string"`);
             if (hasPattern(schema)) {
-                checks.push(`/${schema.pattern.replace(/\//g, '\\/')}/.test(${accessor})`);
+                checks.push(`/${escapeRegexPattern(schema.pattern)}/.test(${accessor})`);
             }
             if (hasMinLength(schema)) {
                 checks.push(`${accessor}.length >= ${schema.minLength}`);

package/dist/generators/generate-strict-assertion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-strict-assertion.d.ts","sourceRoot":"","sources":["../../src/generators/generate-strict-assertion.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAsLjE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,WAAY,UAAU,YAAY,MAAM,KAAG,MAAM,EAe1F,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,WAAY,UAAU,YAAY,MAAM,KAAG,MAAM,GAAG,IAgB7F,CAAA"}
+{"version":3,"file":"generate-strict-assertion.d.ts","sourceRoot":"","sources":["../../src/generators/generate-strict-assertion.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AA+KjE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,WAAY,UAAU,YAAY,MAAM,KAAG,MAAM,EAe1F,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,6BAA6B,WAAY,UAAU,YAAY,MAAM,KAAG,MAAM,GAAG,IAgB7F,CAAA"}

package/dist/generators/generate-strict-assertion.js

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern';
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension';
 import { safeAccessor } from '@amritk/helpers/safe-accessor';
 import { hasEnum, hasExclusiveMaximum, hasExclusiveMinimum, hasMaximum, hasMaxLength, hasMinimum, hasMinLength, hasMultipleOf, hasPattern, hasProperties, hasRef, hasRequired, hasType, isSchemaObject, } from '@amritk/helpers/schema-guards';
@@ -27,12 +28,6 @@ const wrongTypeCondition = (accessor, type) => {
  * `integer` collapses to `number` since both are validated via `typeof === "number"`.
  */
 const typeLabel = (type) => (type === 'integer' ? 'number' : type);
-/**
- * Escapes special regex characters in a pattern string for use in a regex literal.
- */
-const escapeRegexPattern = (pattern) => {
-    return pattern.replace(/\\/g, '\\\\').replace(/\//g, '\\/');
-};
 /**
  * Generates strict-mode constraint checks for a typed property
  * (pattern, length, min/max, multipleOf).

package/dist/generators/generate-validation-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-validation-expression.d.ts","sourceRoot":"","sources":["../../src/generators/generate-validation-expression.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAgDjE;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,QAClC,MAAM,UACH,UAAU,gBACJ,MAAM,cACR,OAAO,eACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,gBACtB,GAAG,CAAC,MAAM,CAAC,qBACN,MAAM,sBACL,OAAO,KAC1B,MA0OF,CAAA"}
+{"version":3,"file":"generate-validation-expression.d.ts","sourceRoot":"","sources":["../../src/generators/generate-validation-expression.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAgDjE;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,QAClC,MAAM,UACH,UAAU,gBACJ,MAAM,cACR,OAAO,eACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,gBACtB,GAAG,CAAC,MAAM,CAAC,qBACN,MAAM,sBACL,OAAO,KAC1B,MA0OF,CAAA"}

package/dist/generators/generate-validation-expression.js

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern';
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension';
 import { resolveRef } from '@amritk/helpers/resolve-ref';
 import { safeAccessor } from '@amritk/helpers/safe-accessor';
@@ -153,7 +154,7 @@ export const generateValidationExpression = (key, schema, defaultValue, isRequir
             case 'string': {
                 checks.push(`typeof ${accessor} === "string"`);
                 if (hasPattern(schema)) {
-                    checks.push(`/${schema.pattern.replace(/\//g, '\\/')}/.test(${accessor})`);
+                    checks.push(`/${escapeRegexPattern(schema.pattern)}/.test(${accessor})`);
                 }
                 if (hasMinLength(schema)) {
                     checks.push(`${accessor}.length >= ${schema.minLength}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amritk/generate-parsers",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Generate TypeScript parsers and type definitions from JSON Schemas.",
   "module": "./dist/index.js",
   "type": "module",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "json-schema-typed": "^8.0.1",
-    "@amritk/helpers": "0.7.1",
+    "@amritk/helpers": "0.8.0",
     "@amritk/generate-markdown": "0.2.4"
   }
 }

package/src/generators/generate-parser-function.ts

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern'
 import { refToName } from '@amritk/helpers/ref-to-name'
 import { safeAccessor, safeKey } from '@amritk/helpers/safe-accessor'
 import {
@@ -947,15 +948,6 @@ const generateInlineValueParser = (schema: JSONSchema): string | null => {
   }
 }
 
-/**
- * Escapes special regex characters in a pattern string for use in a regex literal.
- * This escapes backslashes and forward slashes for safe inclusion in /pattern/ syntax.
- */
-const escapeRegexPattern = (pattern: string): string => {
-  // Escape backslashes first, then forward slashes
-  return pattern.replace(/\\/g, '\\\\').replace(/\//g, '\\/')
-}
-
 /**
  * Generates a parser for schemas with patternProperties.
  * Handles both patternProperties and specification-extensions (x- prefix).

package/src/generators/generate-schema-checks.ts

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern'
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension'
 import {
   hasAdditionalProperties,
@@ -49,7 +50,7 @@ export const generateSchemaChecks = (accessor: string, schema: JSONSchema): stri
     case 'string': {
       checks.push(`typeof ${accessor} === "string"`)
       if (hasPattern(schema)) {
-        checks.push(`/${schema.pattern.replace(/\//g, '\\/')}/.test(${accessor})`)
+        checks.push(`/${escapeRegexPattern(schema.pattern)}/.test(${accessor})`)
       }
       if (hasMinLength(schema)) {
         checks.push(`${accessor}.length >= ${schema.minLength}`)

package/src/generators/generate-strict-assertion.ts

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern'
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension'
 import { safeAccessor } from '@amritk/helpers/safe-accessor'
 import {
@@ -46,13 +47,6 @@ const wrongTypeCondition = (accessor: string, type: string): string | null => {
  */
 const typeLabel = (type: string): string => (type === 'integer' ? 'number' : type)
 
-/**
- * Escapes special regex characters in a pattern string for use in a regex literal.
- */
-const escapeRegexPattern = (pattern: string): string => {
-  return pattern.replace(/\\/g, '\\\\').replace(/\//g, '\\/')
-}
-
 /**
  * Generates strict-mode constraint checks for a typed property
  * (pattern, length, min/max, multipleOf).

package/src/generators/generate-validation-expression.ts

@@ -1,3 +1,4 @@
+import { escapeRegexPattern } from '@amritk/helpers/escape-regex-pattern'
 import { getMjstInstanceOf, getMjstPrimitive } from '@amritk/helpers/mjst-extension'
 import { resolveRef } from '@amritk/helpers/resolve-ref'
 import { safeAccessor } from '@amritk/helpers/safe-accessor'
@@ -208,7 +209,7 @@ export const generateValidationExpression = (
       case 'string': {
         checks.push(`typeof ${accessor} === "string"`)
         if (hasPattern(schema)) {
-          checks.push(`/${schema.pattern.replace(/\//g, '\\/')}/.test(${accessor})`)
+          checks.push(`/${escapeRegexPattern(schema.pattern)}/.test(${accessor})`)
         }
         if (hasMinLength(schema)) {
           checks.push(`${accessor}.length >= ${schema.minLength}`)