@scalar/oas-utils 0.2.73 → 0.2.75

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @scalar/oas-utils
 
+## 0.2.75
+
+### Patch Changes
+
+- 49ccdee: refactor: updates regexHelpers
+
+## 0.2.74
+
+### Patch Changes
+
+- ac55d0f: chore: add time logging for the workspace store
+- Updated dependencies [0c07766]
+  - @scalar/themes@0.9.48
+
 ## 0.2.73
 
 ### 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/dist/transforms/import-spec.d.ts

@@ -15,12 +15,17 @@ export type ImportSpecToWorkspaceArgs = Pick<CollectionPayload, 'documentUrl' |
     setCollectionSecurity?: boolean;
 };
 /**
- * Import an OpenAPI spec file and convert it to workspace entities
+ * Imports an OpenAPI document and converts it to workspace entities (Collection, Request, Server, etc.)
  *
- * We will aim to keep the entities as close to the specification as possible
- * to leverage bi-directional translation. Where entities are able to be
- * created and used at various levels we will index via the uids to create
- * the relationships
+ * The imported entities maintain a close mapping to the original OpenAPI specification to enable:
+ * - Bi-directional translation between spec and workspace entities
+ * - Preservation of specification details and structure
+ * - Accurate representation of relationships between components
+ *
+ * Relationships between entities are maintained through unique identifiers (UIDs) which allow:
+ * - Flexible organization at different levels (workspace, collection, request)
+ * - Proper linking between related components
+ * - Easy lookup and reference of dependent entities
  */
 export declare function importSpecToWorkspace(spec: string | UnknownObject, { authentication, baseServerURL, documentUrl, servers: overloadServers, setCollectionSecurity, watchMode, }?: ImportSpecToWorkspaceArgs): Promise<{
     error: false;

package/dist/transforms/import-spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-spec.d.ts","sourceRoot":"","sources":["../../src/transforms/import-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,cAAc,EAGnB,KAAK,MAAM,EACX,KAAK,GAAG,EAOT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAIhC,MAAM,0BAA0B,CAAA;AAIjC,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAwDxD,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,WACpB,cAAc,SACf,sBAAsB,CAAC,gBAAgB,CAAC,KAC9C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAgC5D,CAAA;AAED,mFAAmF;AACnF,eAAO,MAAM,WAAW,SAAgB,MAAM,GAAG,aAAa;YAKjC,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ;;EACrE,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,iBAAiB,EACjB,aAAa,GAAG,WAAW,CAC5B,GACC,IAAI,CACF,sBAAsB,EACtB,gBAAgB,GAAG,eAAe,GAAG,SAAS,CAC/C,GAAG;IACF,mFAAmF;IACnF,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAEH;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,GAAG,aAAa,EAC5B,EACE,cAAc,EACd,aAAa,EACb,WAAW,EACX,OAAO,EAAE,eAAe,EACxB,qBAA6B,EAC7B,SAAiB,GAClB,GAAE,yBAA8B,GAChC,OAAO,CACN;IACE,KAAK,EAAE,KAAK,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,MAAM,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;IACjD,QAAQ,EAAE,cAAc,EAAE,CAAA;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,eAAe,EAAE,cAAc,EAAE,CAAA;CAClC,GACD;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAC5C,CA0SA"}
+{"version":3,"file":"import-spec.d.ts","sourceRoot":"","sources":["../../src/transforms/import-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,cAAc,EAGnB,KAAK,MAAM,EACX,KAAK,GAAG,EAOT,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAIhC,MAAM,0BAA0B,CAAA;AAIjC,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAwDxD,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,WACpB,cAAc,SACf,sBAAsB,CAAC,gBAAgB,CAAC,KAC9C,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAgC5D,CAAA;AAED,mFAAmF;AACnF,eAAO,MAAM,WAAW,SAAgB,MAAM,GAAG,aAAa;YAOjC,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ;;EACrE,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAC1C,iBAAiB,EACjB,aAAa,GAAG,WAAW,CAC5B,GACC,IAAI,CACF,sBAAsB,EACtB,gBAAgB,GAAG,eAAe,GAAG,SAAS,CAC/C,GAAG;IACF,mFAAmF;IACnF,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAEH;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,GAAG,aAAa,EAC5B,EACE,cAAc,EACd,aAAa,EACb,WAAW,EACX,OAAO,EAAE,eAAe,EACxB,qBAA6B,EAC7B,SAAiB,GAClB,GAAE,yBAA8B,GAChC,OAAO,CACN;IACE,KAAK,EAAE,KAAK,CAAA;IACZ,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,MAAM,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;IACjD,QAAQ,EAAE,cAAc,EAAE,CAAA;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,IAAI,EAAE,GAAG,EAAE,CAAA;IACX,eAAe,EAAE,cAAc,EAAE,CAAA;CAClC,GACD;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAC5C,CA8SA"}

package/dist/transforms/import-spec.js

@@ -86,18 +86,25 @@ const getBaseAuthValues = (scheme, auth) => {
 };
 /** Takes a string or object and parses it into an openapi spec compliant schema */
 const parseSchema = async (spec) => {
+    // TODO: Plugins for URLs and files with the proxy is missing here.
+    // @see packages/api-reference/src/helpers/parse.ts
     const { filesystem } = await load(spec);
     const { specification } = upgrade(filesystem);
     const { schema, errors = [] } = await dereference(specification);
     return { schema: schema, errors };
 };
 /**
- * Import an OpenAPI spec file and convert it to workspace entities
+ * Imports an OpenAPI document and converts it to workspace entities (Collection, Request, Server, etc.)
  *
- * We will aim to keep the entities as close to the specification as possible
- * to leverage bi-directional translation. Where entities are able to be
- * created and used at various levels we will index via the uids to create
- * the relationships
+ * The imported entities maintain a close mapping to the original OpenAPI specification to enable:
+ * - Bi-directional translation between spec and workspace entities
+ * - Preservation of specification details and structure
+ * - Accurate representation of relationships between components
+ *
+ * Relationships between entities are maintained through unique identifiers (UIDs) which allow:
+ * - Flexible organization at different levels (workspace, collection, request)
+ * - Proper linking between related components
+ * - Easy lookup and reference of dependent entities
  */
 async function importSpecToWorkspace(spec, { authentication, baseServerURL, documentUrl, servers: overloadServers, setCollectionSecurity = false, watchMode = false, } = {}) {
     const { schema, errors } = await parseSchema(spec);
@@ -106,6 +113,7 @@ async function importSpecToWorkspace(spec, { authentication, baseServerURL, docu
         return { importWarnings, error: true };
     // ---------------------------------------------------------------------------
     // Some entities will be broken out as individual lists for modification in the workspace
+    const start = performance.now();
     const requests = [];
     // Grab the base server URL for relative servers
     const backupBaseServerUrl = typeof window !== 'undefined' ? window.location.origin : 'http://localhost';
@@ -324,6 +332,8 @@ async function importSpecToWorkspace(spec, { authentication, baseServerURL, docu
         },
         securitySchemes: securitySchemes.map((s) => s.uid),
     });
+    const end = performance.now();
+    console.log(`workspace: ${Math.round(end - start)} ms`);
     /**
      * Servers and requests will be saved in top level maps and indexed via UID to
      * maintain specification relationships

package/package.json

@@ -16,7 +16,7 @@
     "specification",
     "yaml"
   ],
-  "version": "0.2.73",
+  "version": "0.2.75",
   "engines": {
     "node": ">=18"
   },
@@ -108,7 +108,7 @@
     "zod": "^3.23.8",
     "@scalar/object-utils": "1.1.12",
     "@scalar/openapi-types": "0.1.5",
-    "@scalar/themes": "0.9.47",
+    "@scalar/themes": "0.9.48",
     "@scalar/types": "0.0.19"
   },
   "devDependencies": {
@@ -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",