@scalar/oas-utils 0.2.74 → 0.2.75

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scalar/oas-utils
 
+## 0.2.75
+
+### Patch Changes
+
+- 49ccdee: refactor: updates regexHelpers
+
 ## 0.2.74
 
 ### Patch Changes

package/dist/helpers/findVariables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findVariables.d.ts","sourceRoot":"","sources":["../../src/helpers/findVariables.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,aAAa,UAAW,MAAM,aAO1C,CAAA"}
+{"version":3,"file":"findVariables.d.ts","sourceRoot":"","sources":["../../src/helpers/findVariables.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,aAAa,UAAW,MAAM,aAM1C,CAAA"}

package/dist/helpers/findVariables.js

@@ -1,12 +1,10 @@
+import { REGEX } from './regexHelpers.js';
+
 /**
  * Find all strings wrapped in {} or {{}} in value.
  */
 const findVariables = (value) => {
-    // Wrapped in single or double curly braces.
-    // Ignores whitespace
-    // Works with lowercase, uppercase, numbers, dashes, underscores
-    const regex = /(?:\{+)\s*(\w+)\s*(?:\}+)/g;
-    return [...value.matchAll(regex)].map((match) => match[1]?.trim()) || [];
+    return ([...value.matchAll(REGEX.PATH), ...value.matchAll(REGEX.VARIABLES)].map((match) => match[1]?.trim()) || []);
 };
 
 export { findVariables };

package/dist/helpers/index.js

@@ -16,7 +16,7 @@ export { getObjectKeys, objectMerge } from './object.js';
 export { formatJsonOrYamlString, isJsonString, json, parseJsonOrYaml, transformToJson, yaml } from './parse.js';
 export { prettyPrintJson, replaceCircularDependencies } from './prettyPrintJson.js';
 export { isRelativePath, redirectToProxy, shouldUseProxy } from './redirectToProxy.js';
-export { pathRegex, variableRegex } from './regexHelpers.js';
+export { REGEX } from './regexHelpers.js';
 export { replaceVariables } from './replaceVariables.js';
 export { schemaModel } from './schema-model.js';
 export { defaultStateFactory, ssrState } from './ssrState.js';

package/dist/helpers/regexHelpers.d.ts

@@ -1,3 +1,5 @@
-export declare const variableRegex: RegExp;
-export declare const pathRegex: RegExp;
+export declare const REGEX: {
+    readonly VARIABLES: RegExp;
+    readonly PATH: RegExp;
+};
 //# sourceMappingURL=regexHelpers.d.ts.map

package/dist/helpers/regexHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regexHelpers.d.ts","sourceRoot":"","sources":["../../src/helpers/regexHelpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAA+B,CAAA;AACzD,eAAO,MAAM,SAAS,QAAyB,CAAA"}
+{"version":3,"file":"regexHelpers.d.ts","sourceRoot":"","sources":["../../src/helpers/regexHelpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK;;;CAGR,CAAA"}

package/dist/helpers/regexHelpers.js

@@ -1,4 +1,6 @@
-const variableRegex = /{{((?:[^{}]|{[^{}]*})*)}}/g;
-const pathRegex = /(?:{)([^{}]+)}(?!})/g;
+const REGEX = {
+    VARIABLES: /{{((?:[^{}]|{[^{}]*})*)}}/g,
+    PATH: /(?:{)([^{}]+)}(?!})/g,
+};
 
-export { pathRegex, variableRegex };
+export { REGEX };

package/dist/spec-getters/getRequestFromOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRequestFromOperation.d.ts","sourceRoot":"","sources":["../../src/spec-getters/getRequestFromOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAGlB,oBAAoB,EACrB,MAAM,sBAAsB,CAAA;AAK7B,eAAO,MAAM,uBAAuB,cACvB,oBAAoB,YACrB;IACR;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,uBACoB,MAAM,GAAG,MAAM,KACnC,OAAO,CAAC,kBAAkB,CA4D5B,CAAA"}
+{"version":3,"file":"getRequestFromOperation.d.ts","sourceRoot":"","sources":["../../src/spec-getters/getRequestFromOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,kBAAkB,EAGlB,oBAAoB,EACrB,MAAM,sBAAsB,CAAA;AAM7B,eAAO,MAAM,uBAAuB,cACvB,oBAAoB,YACrB;IACR;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,uBACoB,MAAM,GAAG,MAAM,KACnC,OAAO,CAAC,kBAAkB,CA4D5B,CAAA"}

package/dist/spec-getters/getRequestFromOperation.js

@@ -1,5 +1,6 @@
 import { getParametersFromOperation } from './getParametersFromOperation.js';
 import { getRequestBodyFromOperation } from './getRequestBodyFromOperation.js';
+import { REGEX } from '../helpers/regexHelpers.js';
 
 const getRequestFromOperation = (operation, options, selectedExampleKey) => {
     // Replace all variables of the format {something} with the uppercase variable name without the brackets
@@ -7,7 +8,7 @@ const getRequestFromOperation = (operation, options, selectedExampleKey) => {
     // {id} -> 123
     const pathParameters = getParametersFromOperation(operation, 'path', false);
     if (pathParameters.length) {
-        const pathVariables = path.match(/{(.*?)}/g);
+        const pathVariables = path.match(REGEX.PATH);
         if (pathVariables) {
             pathVariables.forEach((variable) => {
                 const variableName = variable.replace(/{|}/g, '');
@@ -22,7 +23,7 @@ const getRequestFromOperation = (operation, options, selectedExampleKey) => {
     }
     // {id} -> __ID__
     if (options?.replaceVariables === true) {
-        const pathVariables = path.match(/{(.*?)}/g);
+        const pathVariables = path.match(REGEX.PATH);
         if (pathVariables) {
             pathVariables.forEach((variable) => {
                 const variableName = variable.replace(/{|}/g, '');

package/package.json

@@ -16,7 +16,7 @@
     "specification",
     "yaml"
   ],
-  "version": "0.2.74",
+  "version": "0.2.75",
   "engines": {
     "node": ">=18"
   },
@@ -116,9 +116,9 @@
     "vite": "^5.4.9",
     "vitest": "^1.6.0",
     "zod-to-ts": "^1.2.0",
+    "@scalar/openapi-types": "0.1.5",
     "@scalar/openapi-parser": "0.8.9",
-    "@scalar/build-tooling": "0.1.12",
-    "@scalar/openapi-types": "0.1.5"
+    "@scalar/build-tooling": "0.1.12"
   },
   "scripts": {
     "build": "scalar-build-rollup",