chore: fix tests by adding extra checks to recursive handler

Redocly · Sep 16, 2022 · 505995d · 505995d
1 parent 81cf184
commit 505995d
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 43 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,16 +22,16 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm install
       - run: git submodule update --init
-      - name: update website
-        if: ${{ github.event_name == 'push' && matrix.node-version == '14.x' }}
-        run: ./scripts/publish-site
-        env:
-          GH_TOKEN_PUBLIC: ${{ secrets.GH_TOKEN_PUBLIC }}
-          GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
-          GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
+      # - name: update website
+      #   if: ${{ github.event_name == 'push' && matrix.node-version == '14.x' }}
+      #   run: ./scripts/publish-site
+      #   env:
+      #     GH_TOKEN_PUBLIC: ${{ secrets.GH_TOKEN_PUBLIC }}
+      #     GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
+      #     GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }}
       - run: npm run build
       - run: npm run test-ci
-      - name: coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+      # - name: coveralls
+      #   uses: coverallsapp/github-action@master
+      #   with:
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/lib/compile/jtd/parse.ts b/lib/compile/jtd/parse.ts
@@ -65,7 +65,9 @@ export default function compileParser(
     parserFunction(cxt)
     gen.optimize(this.opts.code.optimize)
     const parseFuncCode = gen.toString()
-    sourceCode = `${gen.scopeRefs(N.scope)}return ${parseFuncCode}`
+    sourceCode = `const visitedNodesForRef = new WeakMap(); ${gen.scopeRefs(
+      N.scope
+    )}return ${parseFuncCode}`
     const makeParse = new Function(`${N.scope}`, sourceCode)
     const parse: (json: string) => unknown = makeParse(this.scope.get())
     this.scope.value(parseName, {ref: parse})

diff --git a/lib/compile/jtd/serialize.ts b/lib/compile/jtd/serialize.ts
@@ -61,7 +61,9 @@ export default function compileSerializer(
     })
     gen.optimize(this.opts.code.optimize)
     const serializeFuncCode = gen.toString()
-    sourceCode = `${gen.scopeRefs(N.scope)}return ${serializeFuncCode}`
+    sourceCode = `const visitedNodesForRef = new WeakMap(); ${gen.scopeRefs(
+      N.scope
+    )}return ${serializeFuncCode}`
     const makeSerialize = new Function(`${N.scope}`, sourceCode)
     const serialize: (data: unknown) => string = makeSerialize(this.scope.get())
     this.scope.value(serializeName, {ref: serialize})

diff --git a/lib/vocabularies/core/ref.ts b/lib/vocabularies/core/ref.ts
@@ -87,11 +87,17 @@ export function callRef(cxt: KeywordCxt, v: Code, sch?: SchemaEnv, $async?: bool
 
   function callSyncRef(): void {
     const visitedNodes: Name = gen.name("visitedNodes")
-    gen.code(_`const ${visitedNodes} = visitedNodesForRef.get(${v}) || new Set()`)
+    gen.code(
+      _`const ${visitedNodes} = (typeof visitedNodesForRef !== 'undefined') && visitedNodesForRef.get(${v}) || new Set()`
+    )
     gen.if(_`!${visitedNodes}.has(${cxt.data})`, () => {
-      gen.code(_`visitedNodesForRef.set(${v}, ${visitedNodes})`)
+      gen.code(
+        _`if (typeof visitedNodesForRef !== 'undefined') visitedNodesForRef.set(${v}, ${visitedNodes})`
+      )
       gen.code(_`const dataNode = ${cxt.data}`)
-      gen.code(_`${visitedNodes}.add(dataNode)`)
+      gen.code(
+        _`if (typeof dataNode === "object" && dataNode !== null) ${visitedNodes}.add(dataNode)`
+      )
       const res = cxt.result(
         callValidateCode(cxt, v, passCxt),
         () => addEvaluatedFrom(v),

diff --git a/package.json b/package.json
@@ -29,7 +29,9 @@
     "prepublish": "npm run build",
     "benchmark": "npm i && npm run build && npm link && cd ./benchmark && npm link --legacy-peer-deps ajv && npm i && node ./jtd",
     "docs:dev": "./scripts/prepare-site && vuepress dev docs",
-    "docs:build": "./scripts/prepare-site && vuepress build docs"
+    "docs:build": "./scripts/prepare-site && vuepress build docs",
+    "pretest": "npx npe name ajv",
+    "posttest": "npx npe name @redocly/ajv"
   },
   "nyc": {
     "exclude": [

diff --git a/spec/json-schema.spec.ts b/spec/json-schema.spec.ts
@@ -222,6 +222,7 @@ function runTest({instances, draft, tests, skip = [], remotes = {}}: SchemaTest)
     }
     for (const id in remoteRefs) ajv.addSchema(remoteRefs[id], id)
     for (const id in remotes) ajv.addSchema(remotes[id], id)
+    // @ts-ignore
     ajvFormats(ajv)
   }
 

diff --git a/spec/schema-tests.spec.ts b/spec/schema-tests.spec.ts
@@ -43,5 +43,6 @@ function addRemoteRefsAndFormats(ajv: AjvCore) {
   ajv.opts.code.source = true
   for (const id in remoteRefs) ajv.addSchema(remoteRefs[id], id)
   ajv.addSchema(remoteRefsWithIds)
+  // @ts-ignore
   ajvFormats(ajv)
 }
diff --git a/spec/standalone.spec.ts b/spec/standalone.spec.ts
@@ -341,6 +341,7 @@ describe("standalone code generation", () => {
 
     it("should support formats with standalone code", () => {
       const ajv = new _Ajv({code: {source: true}})
+      // @ts-ignore
       ajvFormats(ajv)
       ajv.addSchema(schema)
       const moduleCode = standaloneCode(ajv, {validateUser: "#/definitions/User"})

diff --git a/spec/tsconfig.json b/spec/tsconfig.json
@@ -4,5 +4,8 @@
   "compilerOptions": {
     "types": ["node", "mocha"],
     "noImplicitAny": false
+  },
+  "ts-node": {
+    "transpileOnly": true
   }
 }