btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: lint + bump deps

Browse Source
This commit is contained in:
liyasthomas
2021-11-04 18:23:50 +05:30
parent ad76d100ee
commit 9e74a8c2e7
32 changed files with 1248 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -23,7 +23,7 @@
"lint-staged": "^11.2.6"
},
"devDependencies": {
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0"
"@commitlint/cli": "^14.1.0",
"@commitlint/config-conventional": "^14.1.0"
}
}

8
packages/hoppscotch-app/.eslintrc.js
View File

@@ -18,9 +18,7 @@ module.exports = {
"plugin:prettier/recommended",
"plugin:nuxt/recommended",
],
ignorePatterns: [
"helpers/backend/graphql.ts"
],
ignorePatterns: ["helpers/backend/graphql.ts"],
plugins: ["vue", "prettier"],
// add your custom rules here
rules: {
@@ -43,8 +41,12 @@ module.exports = {
"vue/multiline-html-element-content-newline": "off",
"vue/require-default-prop": "warn",
"vue/require-prop-types": "warn",
"vue/multi-word-component-names": "off",
"prettier/prettier": ["warn", { semi: false }],
"import/no-named-as-default": "off",
"import/prefer-default-export": "off",
"import/no-named-as-default-member": "off",
"import/default": "off",
"no-undef": "off",
// localStorage block
"no-restricted-globals": [

9
packages/hoppscotch-app/.stylelintrc.js
View File

@@ -1,5 +1,10 @@
module.exports = {
extends: ["stylelint-config-standard", "stylelint-config-prettier"],
extends: [
"stylelint-config-standard",
"stylelint-config-prettier",
"stylelint-config-standard-scss",
],
defaultSeverity: "warning",
// add your custom config here
// https://stylelint.io/user-guide/configuration
rules: {
@@ -19,5 +24,7 @@ module.exports = {
],
"declaration-block-trailing-semicolon": null,
"no-descending-specificity": null,
"selector-class-pattern": null,
"selector-id-pattern": null,
},
}

8
packages/hoppscotch-app/assets/scss/styles.scss
View File

@@ -69,11 +69,11 @@ body {
@keyframes fade {
0% {
opacity: 0;
@apply opacity-0;
}
100% {
opacity: 1;
@apply opacity-100;
}
}
@@ -182,10 +182,6 @@ a {
@apply max-h-46;
@apply items-stretch;
@apply overflow-y-auto;
// &::-webkit-scrollbar {
// @apply hidden;
// }
}
hr {

197
packages/hoppscotch-app/assets/scss/themes.scss
View File

@@ -1,374 +1,245 @@
@mixin baseTheme {
@mixin base-theme {
--font-sans: "Inter", sans-serif;
--font-mono: "Roboto Mono", monospace;
--font-icon: "Material Icons";
}
@mixin darkTheme {
// Background color
@mixin dark-theme {
--primary-color: theme("colors.true-gray.900");
// Light Background color
--primary-light-color: theme("colors.dark.600");
// Dark Background color
--primary-dark-color: theme("colors.true-gray.800");
// Text color
--secondary-color: theme("colors.true-gray.400");
// Light Text color
--secondary-light-color: theme("colors.true-gray.500");
// Dark Text color
--secondary-dark-color: theme("colors.true-gray.100");
// Border color
--divider-color: theme("colors.true-gray.800");
// Light Border color
--divider-light-color: theme("colors.dark.500");
// Dark Border color
--divider-dark-color: theme("colors.dark.300");
// Error color
--error-color: theme("colors.warm-gray.800");
// Tooltip color
--tooltip-color: theme("colors.true-gray.100");
// Popover color
--popover-color: theme("colors.dark.700");
// Editor theme
--editor-theme: "merbivore_soft";
}
@mixin lightTheme {
// Background color
@mixin light-theme {
--primary-color: theme("colors.white");
// Light Background color
--primary-light-color: theme("colors.true-gray.50");
// Dark Background color
--primary-dark-color: theme("colors.true-gray.100");
// Text color
--secondary-color: theme("colors.true-gray.500");
// Light Text color
--secondary-light-color: theme("colors.true-gray.400");
// Dark Text color
--secondary-dark-color: theme("colors.true-gray.900");
// Border color
--divider-color: theme("colors.true-gray.200");
// Light Border color
--divider-light-color: theme("colors.true-gray.100");
// Dark Border color
--divider-dark-color: theme("colors.true-gray.300");
// Error color
--error-color: theme("colors.yellow.100");
// Tooltip color
--tooltip-color: theme("colors.true-gray.800");
// Popover color
--popover-color: theme("colors.white");
// Editor theme
--editor-theme: "textmate";
}
@mixin blackTheme {
// Background color
@mixin black-theme {
--primary-color: theme("colors.dark.900");
// Light Background color
--primary-light-color: theme("colors.true-gray.900");
// Dark Background color
--primary-dark-color: theme("colors.dark.800");
// Text color
--secondary-color: theme("colors.true-gray.400");
// Light Text color
--secondary-light-color: theme("colors.true-gray.500");
// Dark Text color
--secondary-dark-color: theme("colors.true-gray.100");
// Border color
--divider-color: theme("colors.true-gray.800");
// Light Border color
--divider-light-color: theme("colors.dark.700");
// Dark Border color
--divider-dark-color: theme("colors.dark.300");
// Error color
--error-color: theme("colors.warm-gray.900");
// Tooltip color
--tooltip-color: theme("colors.true-gray.100");
// Popover color
--popover-color: theme("colors.dark.700");
// Editor theme
--editor-theme: "twilight";
}
@mixin greenTheme {
// Accent color
@mixin green-theme {
--accent-color: theme("colors.green.500");
// Light Accent color
--accent-light-color: theme("colors.green.400");
// Dark Accent color
--accent-dark-color: theme("colors.green.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.green.200");
// Gradient via
--gradient-via-color: theme("colors.green.400");
// Gradient to
--gradient-to-color: theme("colors.green.600");
}
@mixin tealTheme {
// Accent color
@mixin teal-theme {
--accent-color: theme("colors.teal.500");
// Light Accent color
--accent-light-color: theme("colors.teal.400");
// Dark Accent color
--accent-dark-color: theme("colors.teal.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.teal.200");
// Gradient via
--gradient-via-color: theme("colors.teal.400");
// Gradient to
--gradient-to-color: theme("colors.teal.600");
}
@mixin blueTheme {
// Accent color
@mixin blue-theme {
--accent-color: theme("colors.blue.500");
// Light Accent color
--accent-light-color: theme("colors.blue.400");
// Dark Accent color
--accent-dark-color: theme("colors.blue.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.blue.200");
// Gradient via
--gradient-via-color: theme("colors.blue.400");
// Gradient to
--gradient-to-color: theme("colors.blue.600");
}
@mixin indigoTheme {
// Accent color
@mixin indigo-theme {
--accent-color: theme("colors.indigo.500");
// Light Accent color
--accent-light-color: theme("colors.indigo.400");
// Dark Accent color
--accent-dark-color: theme("colors.indigo.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.indigo.200");
// Gradient via
--gradient-via-color: theme("colors.indigo.400");
// Gradient to
--gradient-to-color: theme("colors.indigo.600");
}
@mixin purpleTheme {
// Accent color
@mixin purple-theme {
--accent-color: theme("colors.purple.500");
// Light Accent color
--accent-light-color: theme("colors.purple.400");
// Dark Accent color
--accent-dark-color: theme("colors.purple.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.purple.200");
// Gradient via
--gradient-via-color: theme("colors.purple.400");
// Gradient to
--gradient-to-color: theme("colors.purple.600");
}
@mixin yellowTheme {
// Accent color
@mixin yellow-theme {
--accent-color: theme("colors.yellow.500");
// Light Accent color
--accent-light-color: theme("colors.yellow.400");
// Dark Accent color
--accent-dark-color: theme("colors.yellow.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.yellow.200");
// Gradient via
--gradient-via-color: theme("colors.yellow.400");
// Gradient to
--gradient-to-color: theme("colors.yellow.600");
}
@mixin orangeTheme {
// Accent color
@mixin orange-theme {
--accent-color: theme("colors.orange.500");
// Light Accent color
--accent-light-color: theme("colors.orange.400");
// Dark Accent color
--accent-dark-color: theme("colors.orange.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.orange.200");
// Gradient via
--gradient-via-color: theme("colors.orange.400");
// Gradient to
--gradient-to-color: theme("colors.orange.600");
}
@mixin redTheme {
// Accent color
@mixin red-theme {
--accent-color: theme("colors.red.500");
// Light Accent color
--accent-light-color: theme("colors.red.400");
// Dark Accent color
--accent-dark-color: theme("colors.red.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.red.200");
// Gradient via
--gradient-via-color: theme("colors.red.400");
// Gradient to
--gradient-to-color: theme("colors.red.600");
}
@mixin pinkTheme {
// Accent color
@mixin pink-theme {
--accent-color: theme("colors.pink.500");
// Light Accent color
--accent-light-color: theme("colors.pink.400");
// Dark Accent color
--accent-dark-color: theme("colors.pink.600");
// Light Contrast color
--accent-contrast-color: theme("colors.white");
// Gradient from
--gradient-from-color: theme("colors.pink.200");
// Gradient via
--gradient-via-color: theme("colors.pink.400");
// Gradient to
--gradient-to-color: theme("colors.pink.600");
}
:root {
@include baseTheme;
@include darkTheme;
@include greenTheme;
@include base-theme;
@include dark-theme;
@include green-theme;
}
:root.light {
@include lightTheme;
@include light-theme;
}
:root.dark {
@include darkTheme;
@include dark-theme;
}
:root.black {
@include blackTheme;
@include black-theme;
}
:root[data-accent="blue"] {
@include blueTheme;
@include blue-theme;
}
:root[data-accent="green"] {
@include greenTheme;
@include green-theme;
}
:root[data-accent="teal"] {
@include tealTheme;
@include teal-theme;
}
:root[data-accent="indigo"] {
@include indigoTheme;
@include indigo-theme;
}
:root[data-accent="purple"] {
@include purpleTheme;
@include purple-theme;
}
:root[data-accent="orange"] {
@include orangeTheme;
@include orange-theme;
}
:root[data-accent="pink"] {
@include pinkTheme;
@include pink-theme;
}
:root[data-accent="red"] {
@include redTheme;
@include red-theme;
}
:root[data-accent="yellow"] {
@include yellowTheme;
@include yellow-theme;
}
@mixin fontSmall {
// Font size
@mixin font-small {
--body-font-size: 0.75rem;
// Line height
--body-line-height: 1rem;
// Upper primary sticky fold
--upper-primary-sticky-fold: 4.125rem;
// Upper secondary sticky fold
--upper-secondary-sticky-fold: 6.125rem;
// Upper tertiary sticky fold
--upper-tertiary-sticky-fold: 8.188rem;
// Lower primary sticky fold
--lower-primary-sticky-fold: 3rem;
// Lower secondary sticky fold
--lower-secondary-sticky-fold: 5rem;
// Sidebar primary sticky fold
--sidebar-primary-sticky-fold: 2rem;
// Sidebar secondary sticky fold
--sidebar-secondary-sticky-fold: 4rem;
}
@mixin fontMedium {
// Font size
@mixin font-medium {
--body-font-size: 0.875rem;
// Line height
--body-line-height: 1.25rem;
// Upper primary sticky fold
--upper-primary-sticky-fold: 4.375rem;
// Upper secondary sticky fold
--upper-secondary-sticky-fold: 6.625rem;
// Upper tertiary sticky fold
--upper-tertiary-sticky-fold: 8.813rem;
// Lower primary sticky fold
--lower-primary-sticky-fold: 3.25rem;
// Lower secondary sticky fold
--lower-secondary-sticky-fold: 5.5rem;
// Sidebar primary sticky fold
--sidebar-primary-sticky-fold: 2.25rem;
// Sidebar secondary sticky fold
--sidebar-secondary-sticky-fold: 4.5rem;
}
@mixin fontLarge {
// Font size
@mixin font-large {
--body-font-size: 1rem;
// Line height
--body-line-height: 1.5rem;
// Upper primary sticky fold
--upper-primary-sticky-fold: 4.625rem;
// Upper secondary sticky fold
--upper-secondary-sticky-fold: 7.125rem;
// Upper tertiary sticky fold
--upper-tertiary-sticky-fold: 9.5rem;
// Lower primary sticky fold
--lower-primary-sticky-fold: 3.5rem;
// Lower secondary sticky fold
--lower-secondary-sticky-fold: 6rem;
// Sidebar primary sticky fold
--sidebar-primary-sticky-fold: 2.5rem;
// Sidebar secondary sticky fold
--sidebar-secondary-sticky-fold: 5rem;
}
:root[data-font-size="small"] {
@include fontSmall;
@include font-small;
}
:root[data-font-size="medium"] {
@include fontMedium;
@include font-medium;
}
:root[data-font-size="large"] {
@include fontLarge;
@include font-large;
}

2
packages/hoppscotch-app/components/app/Header.vue
View File

@@ -146,7 +146,7 @@ defineActionHandler("modals.search.toggle", () => {
showSearch.value = !showSearch.value
})
onMounted(async () => {
onMounted(() => {
window.addEventListener("online", () => {
isOnLine.value = true
})

2
packages/hoppscotch-app/components/realtime/Mqtt.vue
View File

@@ -194,7 +194,7 @@ export default defineComponent({
this.debouncer()
},
},
mounted() {
created() {
if (process.browser) {
this.worker = this.$worker.createRejexWorker()
this.worker.addEventListener("message", this.workerResponseHandler)

2
packages/hoppscotch-app/components/realtime/Socketio.vue
View File

@@ -268,7 +268,7 @@ export default defineComponent({
else this.$refs.versionOptions.tippy().enable()
},
},
mounted() {
created() {
if (process.browser) {
this.worker = this.$worker.createRejexWorker()
this.worker.addEventListener("message", this.workerResponseHandler)

2
packages/hoppscotch-app/components/realtime/Sse.vue
View File

@@ -126,7 +126,7 @@ export default defineComponent({
this.debouncer()
},
},
mounted() {
created() {
if (process.browser) {
this.worker = this.$worker.createRejexWorker()
this.worker.addEventListener("message", this.workerResponseHandler)

2
packages/hoppscotch-app/components/realtime/Websocket.vue
View File

@@ -272,7 +272,7 @@ export default defineComponent({
deep: true,
},
},
mounted() {
created() {
if (process.browser) {
this.worker = this.$worker.createRejexWorker()
this.worker.addEventListener("message", this.workerResponseHandler)

8
packages/hoppscotch-app/components/teams/Invite.vue
View File

@@ -402,6 +402,9 @@ import {
TeamInvitationAddedDocument,
TeamInvitationRemovedDocument,
TeamMemberRole,
GetPendingInvitesDocument,
GetPendingInvitesQuery,
GetPendingInvitesQueryVariables,
} from "../../helpers/backend/graphql"
import {
createTeamInvitation,
@@ -409,11 +412,6 @@ import {
revokeTeamInvitation,
} from "../../helpers/backend/mutations/TeamInvitation"
import { GQLError, useGQLQuery } from "~/helpers/backend/GQLClient"
import {
GetPendingInvitesDocument,
GetPendingInvitesQuery,
GetPendingInvitesQueryVariables,
} from "~/helpers/backend/graphql"
const {
$toast,

25
packages/hoppscotch-app/newstore/localpersistence.ts
View File

@@ -190,20 +190,17 @@ function setupEnvironmentsPersistence() {
}
function setupSelectedEnvPersistence() {
const selectedEnvIndex =
pipe(
// Value from local storage can be nullable
O.fromNullable(
window.localStorage.getItem("selectedEnvIndex")
),
O.map(parseInt), // If not null, parse to integer
O.chain(
O.fromPredicate(
Number.isInteger // Check if the number is proper int (not NaN)
)
),
O.getOrElse(() => -1) // If all the above conditions pass, we are good, else set default value (-1)
)
const selectedEnvIndex = pipe(
// Value from local storage can be nullable
O.fromNullable(window.localStorage.getItem("selectedEnvIndex")),
O.map(parseInt), // If not null, parse to integer
O.chain(
O.fromPredicate(
Number.isInteger // Check if the number is proper int (not NaN)
)
),
O.getOrElse(() => -1) // If all the above conditions pass, we are good, else set default value (-1)
)
setCurrentEnvironment(selectedEnvIndex)

33
packages/hoppscotch-app/package.json
View File

@@ -17,11 +17,11 @@
"start": "nuxt start",
"generate": "nuxt generate --modern",
"analyze": "npx nuxt build -a",
"lint:script": "eslint --ext .ts,.js,.vue --ignore-path .gitignore",
"lint:style": "stylelint **/*.{css,scss,vue} --ignore-path .gitignore",
"lint:script": "eslint --ext .ts,.js,.vue --ignore-path .gitignore .",
"lint:style": "stylelint **/*.{css,scss} --ignore-path .gitignore",
"lint": "pnpm run lint:script && pnpm run lint:style",
"lintfix:script": "eslint --fix --ext .ts,.js,.vue --ignore-path .gitignore",
"lintfix:style": "stylelint --fix **/*.{css,scss,vue} --ignore-path .gitignore",
"lintfix:script": "eslint --fix --ext .ts,.js,.vue --ignore-path .gitignore .",
"lintfix:style": "stylelint --fix **/*.{css,scss} --ignore-path .gitignore",
"lintfix": "pnpm run lintfix:script && pnpm run lintfix:style",
"test": "jest",
"do-dev": "pnpm run dev",
@@ -38,7 +38,7 @@
"@nuxtjs/axios": "^5.13.6",
"@nuxtjs/composition-api": "^0.29.3",
"@nuxtjs/gtm": "^2.4.0",
"@nuxtjs/i18n": "^7.1.0",
"@nuxtjs/i18n": "^7.2.0",
"@nuxtjs/robots": "^2.5.0",
"@nuxtjs/sitemap": "^2.4.0",
"@nuxtjs/toast": "^3.3.1",
@@ -50,7 +50,7 @@
"axios": "^0.24.0",
"codemirror": "^5.63.3",
"codemirror-theme-github": "^1.0.0",
"core-js": "^3.19.0",
"core-js": "^3.19.1",
"esprima": "^4.0.1",
"firebase": "^9.2.0",
"fp-ts": "^2.11.5",
@@ -72,7 +72,7 @@
"socket.io-client-v4": "npm:socket.io-client@^4.3.2",
"socketio-wildcard": "^2.0.0",
"splitpanes": "^2.3.8",
"subscriptions-transport-ws": "^0.9.19",
"subscriptions-transport-ws": "^0.11.0",
"tern": "^0.24.3",
"uuid": "8.3.2",
"vue-apollo": "^3.0.8",
@@ -88,12 +88,10 @@
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0",
"@graphql-codegen/add": "^3.1.0",
"@graphql-codegen/cli": "2.2.0",
"@graphql-codegen/cli": "2.2.2",
"@graphql-codegen/typed-document-node": "^2.2.0",
"@graphql-codegen/typescript": "2.2.2",
"@graphql-codegen/typescript": "2.3.0",
"@graphql-codegen/typescript-operations": "^2.2.0",
"@graphql-codegen/typescript-urql-graphcache": "^2.2.0",
"@graphql-codegen/urql-introspection": "^2.1.0",
@@ -102,7 +100,7 @@
"@nuxt/typescript-build": "^2.1.0",
"@nuxtjs/color-mode": "^2.1.1",
"@nuxtjs/dotenv": "^1.4.1",
"@nuxtjs/eslint-config-typescript": "^6.0.1",
"@nuxtjs/eslint-config-typescript": "^7.0.2",
"@nuxtjs/eslint-module": "^3.0.2",
"@nuxtjs/google-analytics": "^2.4.0",
"@nuxtjs/google-fonts": "^1.3.0",
@@ -120,11 +118,11 @@
"@vue/test-utils": "^1.2.2",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^27.3.1",
"eslint": "^7.32.0",
"eslint": "^8.1.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-nuxt": "^2.0.0",
"eslint-plugin-nuxt": "^3.0.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^7.20.0",
"eslint-plugin-vue": "^8.0.3",
"jest": "^27.3.1",
"jest-serializer-vue": "^2.0.2",
"npm-run-all": "^4.1.5",
@@ -134,9 +132,10 @@
"raw-loader": "^4.0.2",
"sass": "^1.43.4",
"sass-loader": "^10.2.0",
"stylelint": "^13.13.1",
"stylelint": "^14.0.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^22.0.0",
"stylelint-config-standard": "^23.0.0",
"stylelint-config-standard-scss": "^2.0.1",
"ts-jest": "^27.0.7",
"typescript": "^4.4.4",
"unplugin-vue2-script-setup": "^0.6.13",

1
packages/hoppscotch-js-sandbox/.eslintrc.js → packages/hoppscotch-js-sandbox/.eslintrc.cjs
View File

@@ -25,5 +25,6 @@ module.exports = {
"import/no-named-as-default": "off",
"no-undef": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-non-null-assertion": "off",
},
}

0
packages/hoppscotch-js-sandbox/.prettierrc.js → packages/hoppscotch-js-sandbox/.prettierrc.cjs
View File

2
packages/hoppscotch-js-sandbox/jest.config.js
View File

@@ -2,5 +2,5 @@ export default {
preset: "ts-jest",
testEnvironment: "node",
collectCoverage: true,
setupFilesAfterEnv: ['./jest.setup.ts'],
setupFilesAfterEnv: ["./jest.setup.ts"],
}

2
packages/hoppscotch-js-sandbox/jest.setup.ts
View File

@@ -1 +1 @@
require('@relmify/jest-fp-ts');
require("@relmify/jest-fp-ts")

15
packages/hoppscotch-js-sandbox/package.json
View File

@@ -11,8 +11,8 @@
},
"scripts": {
"demo": "esrun src/demo.ts",
"lint": "eslint --ext .ts,.js --ignore-path .gitignore",
"lintfix": "eslint --ext .ts,.js --ignore-path .gitignore --fix",
"lint": "eslint --ext .ts,.js --ignore-path .gitignore .",
"lintfix": "eslint --fix --ext .ts,.js --ignore-path .gitignore .",
"test": "npx jest",
"build": "npx tsc",
"clean": "npx tsc --build --clean",
@@ -43,9 +43,9 @@
"@types/jest": "^27.0.2",
"@types/lodash": "^4.14.176",
"@types/node": "^16.11.5",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"eslint": "^7.32.0",
"@typescript-eslint/eslint-plugin": "^5.3.0",
"@typescript-eslint/parser": "^5.3.0",
"eslint": "^8.1.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"io-ts": "^2.2.16",
@@ -54,10 +54,5 @@
"pretty-quick": "^3.1.1",
"ts-jest": "^27.0.7",
"typescript": "^4.4.4"
},
"jest": {
"setupFilesAfterEnv": [
"@relmify/jest-fp-ts"
]
}
}

28
packages/hoppscotch-js-sandbox/src/__tests__/preRequest.spec.ts
View File

@@ -8,11 +8,14 @@ describe("execPreRequestScript", () => {
`
pw.env.set("bob", "newbob")
`,
[{ key: "bob", value: "oldbob" }, { key: "foo", value: "bar" }]
[
{ key: "bob", value: "oldbob" },
{ key: "foo", value: "bar" },
]
)()
).resolves.toEqualRight([
{ key: "bob", value: "newbob" },
{ key: "foo", value: "bar" }
{ key: "foo", value: "bar" },
])
})
@@ -22,7 +25,10 @@ describe("execPreRequestScript", () => {
`
pw.env.set(10, "newbob")
`,
[{ key: "bob", value: "oldbob" }, { key: "foo", value: "bar" }]
[
{ key: "bob", value: "oldbob" },
{ key: "foo", value: "bar" },
]
)()
).resolves.toBeLeft()
})
@@ -33,7 +39,10 @@ describe("execPreRequestScript", () => {
`
pw.env.set("bob", 10)
`,
[{ key: "bob", value: "oldbob" }, { key: "foo", value: "bar" }]
[
{ key: "bob", value: "oldbob" },
{ key: "foo", value: "bar" },
]
)()
).resolves.toBeLeft()
})
@@ -44,7 +53,10 @@ describe("execPreRequestScript", () => {
`
pw.env.set("bob",
`,
[{ key: "bob", value: "oldbob" }, { key: "foo", value: "bar" }]
[
{ key: "bob", value: "oldbob" },
{ key: "foo", value: "bar" },
]
)()
).resolves.toBeLeft()
})
@@ -57,8 +69,6 @@ describe("execPreRequestScript", () => {
`,
[]
)()
).resolves.toEqualRight(
[{ key: "foo", value: "bar" }]
)
).resolves.toEqualRight([{ key: "foo", value: "bar" }])
})
})
})

42
packages/hoppscotch-js-sandbox/src/__tests__/testing/expect/toBe.spec.ts
View File

@@ -4,7 +4,7 @@ import "@relmify/jest-fp-ts"
const fakeResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
headers: [],
}
describe("toBe", () => {
@@ -19,7 +19,9 @@ describe("toBe", () => {
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{ status: "pass", message: "Expected '2' to be '2'" }],
expectResults: [
{ status: "pass", message: "Expected '2' to be '2'" },
],
}),
])
})
@@ -34,7 +36,9 @@ describe("toBe", () => {
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{ status: "fail", message: "Expected '2' to be '4'" }],
expectResults: [
{ status: "fail", message: "Expected '2' to be '4'" },
],
}),
])
})
@@ -51,10 +55,12 @@ describe("toBe", () => {
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: "Expected '2' to not be '2'",
}],
expectResults: [
{
status: "fail",
message: "Expected '2' to not be '2'",
},
],
}),
])
})
@@ -69,10 +75,12 @@ describe("toBe", () => {
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: "Expected '2' to not be '4'",
}],
expectResults: [
{
status: "pass",
message: "Expected '2' to not be '4'",
},
],
}),
])
})
@@ -85,14 +93,16 @@ test("strict checks types", () => {
`
pw.expect(2).toBe("2")
`,
fakeResponse
fakeResponse
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: "Expected '2' to be '2'",
}],
expectResults: [
{
status: "fail",
message: "Expected '2' to be '2'",
},
],
}),
])
})

269
packages/hoppscotch-js-sandbox/src/__tests__/testing/expect/toBeLevelxxx.spec.ts
View File

@@ -4,7 +4,7 @@ import "@relmify/jest-fp-ts"
const fakeResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
headers: [],
}
describe("toBeLevel2xx", () => {
@@ -14,10 +14,12 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to be 200-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to be 200-level status`,
},
],
}),
])
}
@@ -29,10 +31,12 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to be 200-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to be 200-level status`,
},
],
}),
])
}
@@ -43,11 +47,14 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect("foo").toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 200-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 200-level status but could not parse value 'foo'",
},
],
}),
])
})
@@ -57,10 +64,12 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to not be 200-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to not be 200-level status`,
},
],
}),
])
}
@@ -72,10 +81,12 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to not be 200-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to not be 200-level status`,
},
],
}),
])
}
@@ -86,11 +97,14 @@ describe("toBeLevel2xx", () => {
execTestScript(`pw.expect("foo").not.toBeLevel2xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 200-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 200-level status but could not parse value 'foo'",
},
],
}),
])
})
})
@@ -102,10 +116,12 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to be 300-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to be 300-level status`,
},
],
}),
])
}
@@ -117,10 +133,12 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to be 300-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to be 300-level status`,
},
],
}),
])
}
@@ -131,11 +149,14 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect("foo").toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 300-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 300-level status but could not parse value 'foo'",
},
],
}),
])
})
@@ -145,10 +166,12 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to not be 300-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to not be 300-level status`,
},
],
}),
])
}
@@ -160,10 +183,12 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to not be 300-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to not be 300-level status`,
},
],
}),
])
}
@@ -174,14 +199,16 @@ describe("toBeLevel3xx", () => {
execTestScript(`pw.expect("foo").not.toBeLevel3xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 300-level status but could not parse value 'foo'",
}]
})
expectResults: [
{
status: "error",
message:
"Expected 300-level status but could not parse value 'foo'",
},
],
}),
])
})
})
describe("toBeLevel4xx", () => {
@@ -191,10 +218,12 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to be 400-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to be 400-level status`,
},
],
}),
])
}
@@ -206,10 +235,12 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to be 400-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to be 400-level status`,
},
],
}),
])
}
@@ -220,11 +251,14 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect("foo").toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 400-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 400-level status but could not parse value 'foo'",
},
],
}),
])
})
@@ -234,10 +268,12 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to not be 400-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to not be 400-level status`,
},
],
}),
])
}
@@ -249,10 +285,12 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to not be 400-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to not be 400-level status`,
},
],
}),
])
}
@@ -263,11 +301,14 @@ describe("toBeLevel4xx", () => {
execTestScript(`pw.expect("foo").not.toBeLevel4xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 400-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 400-level status but could not parse value 'foo'",
},
],
}),
])
})
})
@@ -279,10 +320,12 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to be 500-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to be 500-level status`,
},
],
}),
])
}
@@ -294,10 +337,12 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect(${i}).toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to be 500-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to be 500-level status`,
},
],
}),
])
}
@@ -308,11 +353,14 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect("foo").toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 500-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 500-level status but could not parse value 'foo'",
},
],
}),
])
})
@@ -322,10 +370,12 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "fail",
message: `Expected '${i}' to not be 500-level status`,
}],
expectResults: [
{
status: "fail",
message: `Expected '${i}' to not be 500-level status`,
},
],
}),
])
}
@@ -337,10 +387,12 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect(${i}).not.toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "pass",
message: `Expected '${i}' to not be 500-level status`,
}],
expectResults: [
{
status: "pass",
message: `Expected '${i}' to not be 500-level status`,
},
],
}),
])
}
@@ -351,11 +403,14 @@ describe("toBeLevel5xx", () => {
execTestScript(`pw.expect("foo").not.toBeLevel5xx()`, fakeResponse)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [{
status: "error",
message: "Expected 500-level status but could not parse value 'foo'",
}],
})
expectResults: [
{
status: "error",
message:
"Expected 500-level status but could not parse value 'foo'",
},
],
}),
])
})
})
})

124
packages/hoppscotch-js-sandbox/src/__tests__/testing/expect/toBeType.spec.ts
View File

@@ -3,7 +3,7 @@ import { execTestScript, TestResponse } from "../../../test-runner"
const fakeResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
headers: [],
}
describe("toBeType", () => {
@@ -16,16 +16,23 @@ describe("toBeType", () => {
pw.expect(true).toBeType("boolean")
pw.expect({}).toBeType("object")
pw.expect(undefined).toBeType("undefined")
`, fakeResponse
`,
fakeResponse
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "pass", message: `Expected '2' to be type 'number'` },
{ status: "pass", message: `Expected '2' to be type 'number'` },
{ status: "pass", message: `Expected '2' to be type 'string'` },
{ status: "pass", message: `Expected 'true' to be type 'boolean'` },
{ status: "pass", message: `Expected '[object Object]' to be type 'object'` },
{ status: "pass", message: `Expected 'undefined' to be type 'undefined'` },
{
status: "pass",
message: `Expected '[object Object]' to be type 'object'`,
},
{
status: "pass",
message: `Expected 'undefined' to be type 'undefined'`,
},
],
}),
])
@@ -46,11 +53,17 @@ describe("toBeType", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "fail", message: `Expected '2' to be type 'string'`},
{ status: "fail", message: `Expected '2' to be type 'number'`},
{ status: "fail", message: `Expected 'true' to be type 'string'`},
{ status: "fail", message: `Expected '[object Object]' to be type 'number'`},
{ status: "fail", message: `Expected 'undefined' to be type 'number'`},
{ status: "fail", message: `Expected '2' to be type 'string'` },
{ status: "fail", message: `Expected '2' to be type 'number'` },
{ status: "fail", message: `Expected 'true' to be type 'string'` },
{
status: "fail",
message: `Expected '[object Object]' to be type 'number'`,
},
{
status: "fail",
message: `Expected 'undefined' to be type 'number'`,
},
],
}),
])
@@ -65,16 +78,26 @@ describe("toBeType", () => {
pw.expect(true).not.toBeType("boolean")
pw.expect({}).not.toBeType("object")
pw.expect(undefined).not.toBeType("undefined")
`, fakeResponse
`,
fakeResponse
)()
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "fail", message: `Expected '2' to not be type 'number'` },
{ status: "fail", message: `Expected '2' to not be type 'string'` },
{ status: "fail", message: `Expected 'true' to not be type 'boolean'` },
{ status: "fail", message: `Expected '[object Object]' to not be type 'object'` },
{ status: "fail", message: `Expected 'undefined' to not be type 'undefined'` },
{
status: "fail",
message: `Expected 'true' to not be type 'boolean'`,
},
{
status: "fail",
message: `Expected '[object Object]' to not be type 'object'`,
},
{
status: "fail",
message: `Expected 'undefined' to not be type 'undefined'`,
},
],
}),
])
@@ -97,9 +120,18 @@ describe("toBeType", () => {
expectResults: [
{ status: "pass", message: `Expected '2' to not be type 'string'` },
{ status: "pass", message: `Expected '2' to not be type 'number'` },
{ status: "pass", message: `Expected 'true' to not be type 'string'` },
{ status: "pass", message: `Expected '[object Object]' to not be type 'number'` },
{ status: "pass", message: `Expected 'undefined' to not be type 'number'` },
{
status: "pass",
message: `Expected 'true' to not be type 'string'`,
},
{
status: "pass",
message: `Expected '[object Object]' to not be type 'number'`,
},
{
status: "pass",
message: `Expected 'undefined' to not be type 'number'`,
},
],
}),
])
@@ -120,13 +152,28 @@ describe("toBeType", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
]
})
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
],
}),
])
})
@@ -145,13 +192,28 @@ describe("toBeType", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
{ status: "error", message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"` },
]
})
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
{
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
},
],
}),
])
})
})

70
packages/hoppscotch-js-sandbox/src/__tests__/testing/expect/toHaveLength.spec.ts
View File

@@ -3,7 +3,7 @@ import { execTestScript, TestResponse } from "../../../test-runner"
const fakeResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
headers: [],
}
describe("toHaveLength", () => {
@@ -20,7 +20,7 @@ describe("toHaveLength", () => {
expect.objectContaining({
expectResults: [
{ status: "pass", message: "Expected the array to be of length '4'" },
{ status: "pass", message: "Expected the array to be of length '0'" },
{ status: "pass", message: "Expected the array to be of length '0'" },
],
}),
])
@@ -57,8 +57,14 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "fail", message: "Expected the array to not be of length '4'" },
{ status: "fail", message: "Expected the array to not be of length '0'" },
{
status: "fail",
message: "Expected the array to not be of length '4'",
},
{
status: "fail",
message: "Expected the array to not be of length '0'",
},
],
}),
])
@@ -76,8 +82,14 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "pass", message: "Expected the array to not be of length '4'" },
{ status: "pass", message: "Expected the array to not be of length '0'" },
{
status: "pass",
message: "Expected the array to not be of length '4'",
},
{
status: "pass",
message: "Expected the array to not be of length '0'",
},
],
}),
])
@@ -95,10 +107,18 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: "Expected toHaveLength to be called for an array or string" },
{ status: "error", message: "Expected toHaveLength to be called for an array or string" },
]
})
{
status: "error",
message:
"Expected toHaveLength to be called for an array or string",
},
{
status: "error",
message:
"Expected toHaveLength to be called for an array or string",
},
],
}),
])
})
@@ -114,10 +134,18 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: "Expected toHaveLength to be called for an array or string" },
{ status: "error", message: "Expected toHaveLength to be called for an array or string" },
]
})
{
status: "error",
message:
"Expected toHaveLength to be called for an array or string",
},
{
status: "error",
message:
"Expected toHaveLength to be called for an array or string",
},
],
}),
])
})
@@ -132,9 +160,12 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: "Argument for toHaveLength should be a number" },
{
status: "error",
message: "Argument for toHaveLength should be a number",
},
],
})
}),
])
})
@@ -149,9 +180,12 @@ describe("toHaveLength", () => {
).resolves.toEqualRight([
expect.objectContaining({
expectResults: [
{ status: "error", message: "Argument for toHaveLength should be a number" },
{
status: "error",
message: "Argument for toHaveLength should be a number",
},
],
})
}),
])
})
})

10
packages/hoppscotch-js-sandbox/src/__tests__/testing/test-runner.spec.ts
View File

@@ -3,7 +3,7 @@ import { execTestScript, TestResponse } from "../../test-runner"
const fakeResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
headers: [],
}
describe("execTestScript function behavior", () => {
@@ -21,7 +21,7 @@ describe("execTestScript function behavior", () => {
`,
fakeResponse
)()
).resolves.toBeRight();
).resolves.toBeRight()
})
test("resolves for tests with failed expectations", () => {
@@ -35,7 +35,8 @@ describe("execTestScript function behavior", () => {
pw.expect(size * 4).toBe(4000);
pw.expect(size / 4).not.toBe(250);
});
`, fakeResponse
`,
fakeResponse
)()
).resolves.toBeRight()
})
@@ -52,7 +53,8 @@ describe("execTestScript function behavior", () => {
pw.expect(size * 4).toBe(4000);
pw.expect(size / 4).not.toBe(250);
});
`, fakeResponse
`,
fakeResponse
)()
).resolves.toBeLeft()
})

12
packages/hoppscotch-js-sandbox/src/__tests__/utils.spec.ts
View File

@@ -15,16 +15,15 @@ afterAll(() => {
})
describe("marshalObjectToVM", () => {
test("successfully marshals simple object into the vm", () => {
const testObj = {
a: 1
a: 1,
}
const objVMHandle: QuickJS.QuickJSHandle | null = pipe(
marshalObjectToVM(vm, testObj),
match(
(e) => null,
() => null,
(result) => result
)
)
@@ -38,7 +37,7 @@ describe("marshalObjectToVM", () => {
test("fails marshalling cyclic object into vm", () => {
const testObj = {
a: 1,
b: null as any
b: null as any,
}
testObj.b = testObj
@@ -46,12 +45,11 @@ describe("marshalObjectToVM", () => {
const objVMHandle: QuickJS.QuickJSHandle | null = pipe(
marshalObjectToVM(vm, testObj),
match(
(e) => null,
() => null,
(result) => result
)
)
expect(objVMHandle).toBeNull()
})
})
})

10
packages/hoppscotch-js-sandbox/src/demo.ts
View File

@@ -1,15 +1,13 @@
import { runTestScript } from "./index"
import { TestResponse } from "./test-runner"
const dummyResponse: TestResponse = {
status: 200,
body: "hoi",
headers: []
};
headers: [],
}
// eslint-disable-next-line prettier/prettier
(async () => {
;(async () => {
console.dir(
await runTestScript(
`
@@ -46,7 +44,7 @@ const dummyResponse: TestResponse = {
pw.expect(arr).not.toHaveLength(4);
});
`,
dummyResponse
dummyResponse
),
{
depth: 100,

2
packages/hoppscotch-js-sandbox/src/global.d.ts vendored
View File

@@ -1 +1 @@
import '@relmify/jest-fp-ts';
import "@relmify/jest-fp-ts"

20
packages/hoppscotch-js-sandbox/src/index.ts
View File

@@ -1,7 +1,11 @@
import { pipe } from "fp-ts/lib/function"
import { chain, right } from "fp-ts/lib/TaskEither"
import { execPreRequestScript } from "./preRequest"
import { execTestScript, TestResponse, TestDescriptor as _TestDescriptor } from "./test-runner"
import {
execTestScript,
TestResponse,
TestDescriptor as _TestDescriptor,
} from "./test-runner"
export type TestDescriptor = _TestDescriptor
/**
@@ -9,13 +13,11 @@ export type TestDescriptor = _TestDescriptor
* @param testScript The string of the script to run
* @returns A TaskEither with an error message or a TestDescriptor with the final status
*/
export const runTestScript = (
testScript: string,
response: TestResponse
) => pipe(
execTestScript(testScript, response),
chain((results) => right(results[0])) // execTestScript returns an array of descriptors with a single element (extract that)
)
export const runTestScript = (testScript: string, response: TestResponse) =>
pipe(
execTestScript(testScript, response),
chain((results) => right(results[0])) // execTestScript returns an array of descriptors with a single element (extract that)
)
/**
* Executes a given pre-request script on the sandbox
@@ -23,4 +25,4 @@ export const runTestScript = (
* @param env The envirionment variables active
* @returns A TaskEither with an error message or an array of the final environments with the all the script values applied
*/
export const runPreRequestScript = execPreRequestScript
export const runPreRequestScript = execPreRequestScript

80
packages/hoppscotch-js-sandbox/src/preRequest.ts
View File

@@ -1,23 +1,23 @@
import { pipe } from "fp-ts/lib/function";
import { chain, TaskEither, tryCatch, right, left } from "fp-ts/lib/TaskEither";
import * as qjs from "quickjs-emscripten";
import clone from "lodash/clone";
import { pipe } from "fp-ts/lib/function"
import { chain, TaskEither, tryCatch, right, left } from "fp-ts/lib/TaskEither"
import * as qjs from "quickjs-emscripten"
import clone from "lodash/clone"
type EnvEntry = {
key: string;
value: string;
};
key: string
value: string
}
export const execPreRequestScript = (
preRequestScript: string,
env: EnvEntry[]
): TaskEither<string, EnvEntry[]> => pipe(
tryCatch(
async () => await qjs.getQuickJS(),
(reason) => `QuickJS initialization failed: ${reason}`
),
chain(
(QuickJS) => {
): TaskEither<string, EnvEntry[]> =>
pipe(
tryCatch(
async () => await qjs.getQuickJS(),
(reason) => `QuickJS initialization failed: ${reason}`
),
chain((QuickJS) => {
const finalEnv = clone(env)
const vm = QuickJS.createVm()
@@ -26,30 +26,35 @@ export const execPreRequestScript = (
const envHandle = vm.newObject()
const envSetFuncHandle = vm.newFunction("set", (keyHandle, valueHandle) => {
const key = vm.dump(keyHandle)
const value = vm.dump(valueHandle)
const envSetFuncHandle = vm.newFunction(
"set",
(keyHandle, valueHandle) => {
const key = vm.dump(keyHandle)
const value = vm.dump(valueHandle)
if (typeof key !== "string") return {
error: vm.newString("Expected key to be a string")
if (typeof key !== "string")
return {
error: vm.newString("Expected key to be a string"),
}
if (typeof value !== "string")
return {
error: vm.newString("Expected value to be a string"),
}
const keyIndex = finalEnv.findIndex((env) => env.key === key)
if (keyIndex === -1) {
finalEnv.push({ key, value })
} else {
finalEnv[keyIndex] = { key, value }
}
return {
value: vm.undefined,
}
}
if (typeof value !== "string") return {
error: vm.newString("Expected value to be a string")
}
const keyIndex = finalEnv.findIndex((env) => env.key === key)
if (keyIndex === -1) {
finalEnv.push({ key, value })
} else {
finalEnv[keyIndex] = { key, value }
}
return {
value: vm.undefined
}
})
)
vm.setProp(envHandle, "set", envSetFuncHandle)
envSetFuncHandle.dispose()
@@ -72,6 +77,5 @@ export const execPreRequestScript = (
vm.dispose()
return right(finalEnv)
}
})
)
)

221
packages/hoppscotch-js-sandbox/src/test-runner.ts
View File

@@ -9,9 +9,9 @@ import { marshalObjectToVM } from "./utils"
*/
export type TestResponse = {
/** Status Code of the response */
status: number,
status: number
/** List of headers returned */
headers: { key: string, value: string }[],
headers: { key: string; value: string }[]
/**
* Body of the response, this will be the JSON object if it is a JSON content type, else body string
*/
@@ -21,8 +21,7 @@ export type TestResponse = {
/**
* The result of an expectation statement
*/
type ExpectResult =
| { status: "pass" | "fail" | "error", message: string } // The expectation failed (fail) or errored (error)
type ExpectResult = { status: "pass" | "fail" | "error"; message: string } // The expectation failed (fail) or errored (error)
/**
* An object defining the result of the execution of a
@@ -68,14 +67,18 @@ function createExpectation(
if (negated) assertion = !assertion
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be '${expectedVal}'`
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be '${expectedVal}'`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be '${expectedVal}'`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be '${expectedVal}'`,
})
}
@@ -91,13 +94,16 @@ function createExpectation(
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be 200-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 200-level status`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message:
`Expected '${expectVal}' to${negated ? " not" : ""} be 200-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 200-level status`,
})
}
} else {
@@ -119,13 +125,16 @@ function createExpectation(
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be 300-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 300-level status`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message:
`Expected '${expectVal}' to${negated ? " not" : ""} be 300-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 300-level status`,
})
}
} else {
@@ -147,13 +156,16 @@ function createExpectation(
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be 400-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 400-level status`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message:
`Expected '${expectVal}' to${negated ? " not" : ""} be 400-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 400-level status`,
})
}
} else {
@@ -175,12 +187,16 @@ function createExpectation(
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be 500-level status`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 500-level status`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be 500-level status`
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be 500-level status`,
})
}
} else {
@@ -189,7 +205,7 @@ function createExpectation(
message: `Expected 500-level status but could not parse value '${expectVal}'`,
})
}
return { value: vm.undefined }
})
@@ -197,25 +213,40 @@ function createExpectation(
const expectedType = vm.dump(expectedValHandle)
// Check if the expectation param is a valid type name string, else error
if (["string", "boolean", "number", "object", "undefined", "bigint", "symbol", "function"].includes(expectedType)) {
if (
[
"string",
"boolean",
"number",
"object",
"undefined",
"bigint",
"symbol",
"function",
].includes(expectedType)
) {
let assertion = typeof expectVal === expectedType
if (negated) assertion = !assertion
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be type '${expectedType}'`
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be type '${expectedType}'`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message: `Expected '${expectVal}' to${negated ? " not" : ""} be type '${expectedType}'`,
message: `Expected '${expectVal}' to${
negated ? " not" : ""
} be type '${expectedType}'`,
})
}
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "error",
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`
message: `Argument for toBeType should be "string", "boolean", "number", "object", "undefined", "bigint", "symbol" or "function"`,
})
}
@@ -240,25 +271,29 @@ function createExpectation(
if (typeof expectedLength === "number" && !Number.isNaN(expectedLength)) {
let assertion = (expectVal as any[]).length === expectedLength
if (negated) assertion = !assertion
if (assertion) {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "pass",
message: `Expected the array to${negated ? " not" : ""} be of length '${expectedLength}'`,
message: `Expected the array to${
negated ? " not" : ""
} be of length '${expectedLength}'`,
})
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "fail",
message: `Expected the array to${negated ? " not" : ""} be of length '${expectedLength}'`
message: `Expected the array to${
negated ? " not" : ""
} be of length '${expectedLength}'`,
})
}
} else {
currTestStack[currTestStack.length - 1].expectResults.push({
status: "error",
message: `Argument for toHaveLength should be a number`
message: `Argument for toHaveLength should be a number`,
})
}
return { value: vm.undefined }
}
)
@@ -291,77 +326,81 @@ function createExpectation(
export const execTestScript = (
testScript: string,
response: TestResponse
): TaskEither<string, TestDescriptor[]> => pipe(
tryCatch(
async () => await qjs.getQuickJS(),
(reason) => `QuickJS initialization failed: ${reason}`
),
chain(
// TODO: Make this more functional ?
(QuickJS) => {
const vm = QuickJS.createVm()
): TaskEither<string, TestDescriptor[]> =>
pipe(
tryCatch(
async () => await qjs.getQuickJS(),
(reason) => `QuickJS initialization failed: ${reason}`
),
chain(
// TODO: Make this more functional ?
(QuickJS) => {
const vm = QuickJS.createVm()
const pwHandle = vm.newObject()
const pwHandle = vm.newObject()
const testRunStack: TestDescriptor[] = [
{ descriptor: "root", expectResults: [], children: [] },
]
const testRunStack: TestDescriptor[] = [
{ descriptor: "root", expectResults: [], children: [] },
]
const testFuncHandle = vm.newFunction(
"test",
(descriptorHandle, testFuncHandle) => {
const descriptor = vm.getString(descriptorHandle)
const testFuncHandle = vm.newFunction(
"test",
(descriptorHandle, testFuncHandle) => {
const descriptor = vm.getString(descriptorHandle)
testRunStack.push({
descriptor,
expectResults: [],
children: [],
})
testRunStack.push({
descriptor,
expectResults: [],
children: [],
})
const result = vm.unwrapResult(vm.callFunction(testFuncHandle, vm.null))
result.dispose()
const result = vm.unwrapResult(
vm.callFunction(testFuncHandle, vm.null)
)
result.dispose()
const child = testRunStack.pop() as TestDescriptor
testRunStack[testRunStack.length - 1].children.push(child)
const child = testRunStack.pop() as TestDescriptor
testRunStack[testRunStack.length - 1].children.push(child)
}
)
const expectFnHandle = vm.newFunction("expect", (expectValueHandle) => {
const expectVal = vm.dump(expectValueHandle)
return {
value: createExpectation(vm, expectVal, false, testRunStack),
}
})
// Marshal response object
const responseObjHandle = marshalObjectToVM(vm, response)
if (isLeft(responseObjHandle))
return left(`Response marshalling failed: ${responseObjHandle.left}`)
vm.setProp(pwHandle, "response", responseObjHandle.right)
responseObjHandle.right.dispose()
vm.setProp(pwHandle, "expect", expectFnHandle)
expectFnHandle.dispose()
vm.setProp(pwHandle, "test", testFuncHandle)
testFuncHandle.dispose()
vm.setProp(vm.global, "pw", pwHandle)
pwHandle.dispose()
const evalRes = vm.evalCode(testScript)
if (evalRes.error) {
const errorData = vm.dump(evalRes.error)
evalRes.error.dispose()
return left(`Script evaluation failed: ${errorData}`)
}
)
const expectFnHandle = vm.newFunction("expect", (expectValueHandle) => {
const expectVal = vm.dump(expectValueHandle)
vm.dispose()
return {
value: createExpectation(vm, expectVal, false, testRunStack),
}
})
// Marshal response object
const responseObjHandle = marshalObjectToVM(vm, response)
if (isLeft(responseObjHandle)) return left(`Response marshalling failed: ${responseObjHandle.left}`)
vm.setProp(pwHandle, "response", responseObjHandle.right)
responseObjHandle.right.dispose()
vm.setProp(pwHandle, "expect", expectFnHandle)
expectFnHandle.dispose()
vm.setProp(pwHandle, "test", testFuncHandle)
testFuncHandle.dispose()
vm.setProp(vm.global, "pw", pwHandle)
pwHandle.dispose()
const evalRes = vm.evalCode(testScript)
if (evalRes.error) {
const errorData = vm.dump(evalRes.error)
evalRes.error.dispose()
return left(`Script evaluation failed: ${errorData}`)
return right(testRunStack)
}
vm.dispose()
return right(testRunStack)
}
)
)
)

19
packages/hoppscotch-js-sandbox/src/utils.ts
View File

@@ -1,7 +1,10 @@
import { Either, left, right } from "fp-ts/lib/Either";
import * as QuickJS from "quickjs-emscripten";
import { Either, left, right } from "fp-ts/lib/Either"
import * as QuickJS from "quickjs-emscripten"
export function marshalObjectToVM(vm: QuickJS.QuickJSVm, obj: object): Either<string, QuickJS.QuickJSHandle> {
export function marshalObjectToVM(
vm: QuickJS.QuickJSVm,
obj: object
): Either<string, QuickJS.QuickJSHandle> {
let jsonString
try {
@@ -15,7 +18,11 @@ export function marshalObjectToVM(vm: QuickJS.QuickJSVm, obj: object): Either<st
const jsonHandle = vm.getProp(vm.global, "JSON")
const parseFuncHandle = vm.getProp(jsonHandle, "parse")
const parseResultHandle = vm.callFunction(parseFuncHandle, vm.undefined, vmStringHandle)
const parseResultHandle = vm.callFunction(
parseFuncHandle,
vm.undefined,
vmStringHandle
)
if (parseResultHandle.error) {
parseResultHandle.error.dispose()
@@ -27,6 +34,6 @@ export function marshalObjectToVM(vm: QuickJS.QuickJSVm, obj: object): Either<st
vmStringHandle.dispose()
parseFuncHandle.dispose()
jsonHandle.dispose()
return right(resultHandle)
}
}

1284
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff