diff --git a/plugins/exporter-curl/package-lock.json b/plugins/exporter-curl/package-lock.json index 6da045bf..30fda584 100644 --- a/plugins/exporter-curl/package-lock.json +++ b/plugins/exporter-curl/package-lock.json @@ -8,7 +8,7 @@ "name": "exporter-curl", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@types/node": "^20.14.9", @@ -702,9 +702,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/exporter-curl/package.json b/plugins/exporter-curl/package.json index 7dbbe30b..8dc1fec2 100644 --- a/plugins/exporter-curl/package.json +++ b/plugins/exporter-curl/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@types/node": "^20.14.9", diff --git a/plugins/filter-jsonpath/package-lock.json b/plugins/filter-jsonpath/package-lock.json index 36b80dc2..755b6e1a 100644 --- a/plugins/filter-jsonpath/package-lock.json +++ b/plugins/filter-jsonpath/package-lock.json @@ -8,7 +8,7 @@ "name": "filter-jsonpath", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "jsonpath-plus": "^9.0.0" }, "devDependencies": { @@ -49,9 +49,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/filter-jsonpath/package.json b/plugins/filter-jsonpath/package.json index 4485f071..1b95ab94 100644 --- a/plugins/filter-jsonpath/package.json +++ b/plugins/filter-jsonpath/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "jsonpath-plus": "^9.0.0", - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@yaakapp/cli": "^0.0.42", diff --git a/plugins/filter-xpath/package-lock.json b/plugins/filter-xpath/package-lock.json index 4e27df34..7601a55e 100644 --- a/plugins/filter-xpath/package-lock.json +++ b/plugins/filter-xpath/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@xmldom/xmldom": "^0.8.10", - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "xpath": "^0.0.34" }, "devDependencies": { @@ -36,9 +36,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/filter-xpath/package.json b/plugins/filter-xpath/package.json index 7018698c..b8d38034 100644 --- a/plugins/filter-xpath/package.json +++ b/plugins/filter-xpath/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "@xmldom/xmldom": "^0.8.10", "xpath": "^0.0.34" }, diff --git a/plugins/importer-curl/package-lock.json b/plugins/importer-curl/package-lock.json index 686d0c67..b03a98f3 100644 --- a/plugins/importer-curl/package-lock.json +++ b/plugins/importer-curl/package-lock.json @@ -8,7 +8,7 @@ "name": "importer-curl", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "shell-quote": "^1.8.1" }, "devDependencies": { @@ -710,9 +710,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/importer-curl/package.json b/plugins/importer-curl/package.json index 41fcc851..b6dc6ccd 100644 --- a/plugins/importer-curl/package.json +++ b/plugins/importer-curl/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "shell-quote": "^1.8.1" }, "devDependencies": { diff --git a/plugins/importer-curl/src/index.ts b/plugins/importer-curl/src/index.ts index 87b6f40e..00cb4ca6 100644 --- a/plugins/importer-curl/src/index.ts +++ b/plugins/importer-curl/src/index.ts @@ -1,4 +1,4 @@ -import { Environment, Folder, HttpRequest, HttpUrlParameter, Model, Workspace, Context } from '@yaakapp/api'; +import { Context, Environment, Folder, HttpRequest, HttpUrlParameter, Workspace } from '@yaakapp/api'; import { ControlOperator, parse, ParseEntry } from 'shell-quote'; type AtLeast = Partial & Pick; @@ -405,9 +405,9 @@ function splitOnce(str: string, sep: string): string[] { return [str]; } -const idCount: Partial> = {}; +const idCount: Partial> = {}; -function generateId(model: Model['model']): string { +function generateId(model: string): string { idCount[model] = (idCount[model] ?? -1) + 1; return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`; } diff --git a/plugins/importer-curl/tests/index.test.ts b/plugins/importer-curl/tests/index.test.ts index b0fa1028..bb536212 100644 --- a/plugins/importer-curl/tests/index.test.ts +++ b/plugins/importer-curl/tests/index.test.ts @@ -1,4 +1,4 @@ -import { Context, HttpRequest, Model, Workspace } from '@yaakapp/api'; +import { Context, HttpRequest, Workspace } from '@yaakapp/api'; import { describe, expect, test } from 'vitest'; import { pluginHookImport } from '../src'; @@ -307,7 +307,7 @@ describe('importer-curl', () => { }); }); -const idCount: Partial> = {}; +const idCount: Partial> = {}; function baseRequest(mergeWith: Partial) { idCount.http_request = (idCount.http_request ?? -1) + 1; diff --git a/plugins/importer-insomnia/package-lock.json b/plugins/importer-insomnia/package-lock.json index a1c7febd..188b1e89 100644 --- a/plugins/importer-insomnia/package-lock.json +++ b/plugins/importer-insomnia/package-lock.json @@ -8,7 +8,7 @@ "name": "importer-insomnia", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "yaml": "^2.4.2" }, "devDependencies": { @@ -27,9 +27,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/importer-insomnia/package.json b/plugins/importer-insomnia/package.json index 1bc2ad03..fe036c65 100644 --- a/plugins/importer-insomnia/package.json +++ b/plugins/importer-insomnia/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "yaml": "^2.4.2" }, "devDependencies": { diff --git a/plugins/importer-openapi/package-lock.json b/plugins/importer-openapi/package-lock.json index 013c9ea6..8b0a552e 100644 --- a/plugins/importer-openapi/package-lock.json +++ b/plugins/importer-openapi/package-lock.json @@ -8,7 +8,7 @@ "name": "importer-openapi", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "openapi-to-postmanv2": "^4.23.1", "yaml": "^2.4.2" }, @@ -57,9 +57,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/importer-openapi/package.json b/plugins/importer-openapi/package.json index 71ce22ba..1c151b50 100644 --- a/plugins/importer-openapi/package.json +++ b/plugins/importer-openapi/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "openapi-to-postmanv2": "^4.23.1", "yaml": "^2.4.2" }, diff --git a/plugins/importer-postman/package-lock.json b/plugins/importer-postman/package-lock.json index f670c432..50df57fb 100644 --- a/plugins/importer-postman/package-lock.json +++ b/plugins/importer-postman/package-lock.json @@ -8,7 +8,7 @@ "name": "importer-postman", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@types/node": "^20.14.9", @@ -664,9 +664,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/importer-postman/package.json b/plugins/importer-postman/package.json index 8bf5fd7e..0664e764 100644 --- a/plugins/importer-postman/package.json +++ b/plugins/importer-postman/package.json @@ -7,7 +7,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@yaakapp/cli": "^0.0.42", diff --git a/plugins/importer-postman/src/index.ts b/plugins/importer-postman/src/index.ts index 229901d0..b4376aa9 100644 --- a/plugins/importer-postman/src/index.ts +++ b/plugins/importer-postman/src/index.ts @@ -1,12 +1,11 @@ import { + Context, Environment, Folder, HttpRequest, HttpRequestHeader, - Model, - Workspace, - Context, HttpUrlParameter, + Workspace, } from '@yaakapp/api'; const POSTMAN_2_1_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json'; @@ -327,9 +326,9 @@ function convertTemplateSyntax(obj: T): T { } } -const idCount: Partial> = {}; +const idCount: Partial> = {}; -function generateId(model: Model['model']): string { +function generateId(model: string): string { idCount[model] = (idCount[model] ?? -1) + 1; return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`; } diff --git a/plugins/importer-yaak/package-lock.json b/plugins/importer-yaak/package-lock.json index 788776b1..e3f9002d 100644 --- a/plugins/importer-yaak/package-lock.json +++ b/plugins/importer-yaak/package-lock.json @@ -8,7 +8,7 @@ "name": "importer-yaak", "version": "0.0.1", "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@types/node": "^20.14.9", @@ -395,9 +395,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/importer-yaak/package.json b/plugins/importer-yaak/package.json index 0d6aceae..84bda648 100644 --- a/plugins/importer-yaak/package.json +++ b/plugins/importer-yaak/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.js" }, "dependencies": { - "@yaakapp/api": "^0.2.5" + "@yaakapp/api": "^0.2.7" }, "devDependencies": { "@yaakapp/cli": "^0.0.42", diff --git a/plugins/template-function-response/package-lock.json b/plugins/template-function-response/package-lock.json index db9caadf..1ce99e56 100644 --- a/plugins/template-function-response/package-lock.json +++ b/plugins/template-function-response/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "@xmldom/xmldom": "^0.8.10", - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "jsonpath-plus": "^9.0.0", "xpath": "^0.0.34" }, @@ -742,9 +742,9 @@ } }, "node_modules/@yaakapp/api": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.5.tgz", - "integrity": "sha512-UXD4Vvm4IVGNqKQuORnlbZ/RSOqA3AkkvaBqcipqGCodkx/4kM1602fBFfBZMdiouq0RyyQ65ByWvJWVre/adg==", + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@yaakapp/api/-/api-0.2.7.tgz", + "integrity": "sha512-vU9KtEwe5a+6VpDtV5+GSV+BpZETer/M9TtZ+oDZovvFMO0d55KqPfs7S6PuMru6e8Yxky8mO1TjL4Vsylh2Gg==", "dependencies": { "@types/node": "^22.5.4" } diff --git a/plugins/template-function-response/package.json b/plugins/template-function-response/package.json index 632474ae..fcf7c537 100644 --- a/plugins/template-function-response/package.json +++ b/plugins/template-function-response/package.json @@ -6,7 +6,7 @@ "build": "yaakcli build ./src/index.ts" }, "dependencies": { - "@yaakapp/api": "^0.2.5", + "@yaakapp/api": "^0.2.7", "jsonpath-plus": "^9.0.0", "xpath": "^0.0.34", "@xmldom/xmldom": "^0.8.10"