@scalar/json-magic 0.5.1 → 0.6.0

package/.turbo/turbo-build.log

@@ -1,10 +1,10 @@
 
-> @scalar/json-magic@0.5.1 build /home/runner/work/scalar/scalar/packages/json-magic
+> @scalar/json-magic@0.6.0 build /home/runner/work/scalar/scalar/packages/json-magic
 > scalar-build-esbuild
 
-@scalar/json-magic: Build completed in 29.83ms
+@scalar/json-magic: Build completed in 61.22ms
 
-> @scalar/json-magic@0.5.1 types:build /home/runner/work/scalar/scalar/packages/json-magic
+> @scalar/json-magic@0.6.0 types:build /home/runner/work/scalar/scalar/packages/json-magic
 > scalar-types-build
 
-Types build completed in 1.46s
+Types build completed in 1.77s

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @scalar/json-magic
 
+## 0.6.0
+
+### Minor Changes
+
+- 4951456: feat: merge yaml aliases for in-mem representation
+
+## 0.5.2
+
+### Patch Changes
+
+- 6462733: fix: comment out flaky test for now
+
 ## 0.5.1
 
 ### Patch Changes

package/dist/bundle/plugins/parse-yaml/index.js

@@ -8,7 +8,7 @@ function parseYaml() {
       try {
         return {
           ok: true,
-          data: YAML.parse(value)
+          data: YAML.parse(value, { merge: true, maxAliasCount: 1e4 })
         };
       } catch {
         return {

package/dist/bundle/plugins/parse-yaml/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/bundle/plugins/parse-yaml/index.ts"],
-  "sourcesContent": ["import YAML from 'yaml'\n\nimport type { LoaderPlugin, ResolveResult } from '@/bundle'\nimport { isYaml } from '@/helpers/is-yaml'\n\n/**\n * Creates a plugin that parses YAML strings into JavaScript objects.\n * @returns A plugin object with validate and exec functions\n * @example\n * ```ts\n * const yamlPlugin = parseYaml()\n * const result = yamlPlugin.exec('name: John\\nage: 30')\n * // result = { name: 'John', age: 30 }\n * ```\n */\nexport function parseYaml(): LoaderPlugin {\n  return {\n    type: 'loader',\n    validate: isYaml,\n    exec: async (value): Promise<ResolveResult> => {\n      try {\n        return {\n          ok: true,\n          data: YAML.parse(value),\n        }\n      } catch {\n        return {\n          ok: false,\n        }\n      }\n    },\n  }\n}\n"],
-  "mappings": "AAAA,OAAO,UAAU;AAGjB,SAAS,cAAc;AAYhB,SAAS,YAA0B;AACxC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,UAAU;AAAA,IACV,MAAM,OAAO,UAAkC;AAC7C,UAAI;AACF,eAAO;AAAA,UACL,IAAI;AAAA,UACJ,MAAM,KAAK,MAAM,KAAK;AAAA,QACxB;AAAA,MACF,QAAQ;AACN,eAAO;AAAA,UACL,IAAI;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import YAML from 'yaml'\n\nimport type { LoaderPlugin, ResolveResult } from '@/bundle'\nimport { isYaml } from '@/helpers/is-yaml'\n\n/**\n * Creates a plugin that parses YAML strings into JavaScript objects.\n * @returns A plugin object with validate and exec functions\n * @example\n * ```ts\n * const yamlPlugin = parseYaml()\n * const result = yamlPlugin.exec('name: John\\nage: 30')\n * // result = { name: 'John', age: 30 }\n * ```\n */\nexport function parseYaml(): LoaderPlugin {\n  return {\n    type: 'loader',\n    validate: isYaml,\n    exec: async (value): Promise<ResolveResult> => {\n      try {\n        return {\n          ok: true,\n          data: YAML.parse(value, { merge: true, maxAliasCount: 10000 }),\n        }\n      } catch {\n        return {\n          ok: false,\n        }\n      }\n    },\n  }\n}\n"],
+  "mappings": "AAAA,OAAO,UAAU;AAGjB,SAAS,cAAc;AAYhB,SAAS,YAA0B;AACxC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,UAAU;AAAA,IACV,MAAM,OAAO,UAAkC;AAC7C,UAAI;AACF,eAAO;AAAA,UACL,IAAI;AAAA,UACJ,MAAM,KAAK,MAAM,OAAO,EAAE,OAAO,MAAM,eAAe,IAAM,CAAC;AAAA,QAC/D;AAAA,MACF,QAAQ;AACN,eAAO;AAAA,UACL,IAAI;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

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

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/helpers/normalize.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,GAAG,OA4BrC"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/helpers/normalize.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,GAAG,OA6BrC"}

package/dist/helpers/normalize.js

@@ -16,7 +16,8 @@ function normalize(content) {
         return void 0;
       }
       return parse(content, {
-        maxAliasCount: 1e4
+        maxAliasCount: 1e4,
+        merge: true
       });
     }
   }

package/dist/helpers/normalize.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/helpers/normalize.ts"],
-  "sourcesContent": ["import { parse } from 'yaml'\n\n/**\n * Normalize a string (YAML, JSON, object) to a JavaScript datatype.\n */\nexport function normalize(content: any) {\n  if (content === null) {\n    return undefined\n  }\n\n  if (typeof content === 'string') {\n    if (content.trim() === '') {\n      return undefined\n    }\n\n    try {\n      return JSON.parse(content)\n    } catch (_error) {\n      // Does it look like YAML?\n      const hasColon = /^[^:]+:/.test(content)\n      const isJson = content.slice(0, 50).trimStart().startsWith('{')\n\n      if (!hasColon || isJson) {\n        return undefined\n      }\n\n      return parse(content, {\n        maxAliasCount: 10000,\n      })\n    }\n  }\n\n  return content\n}\n"],
-  "mappings": "AAAA,SAAS,aAAa;AAKf,SAAS,UAAU,SAAc;AACtC,MAAI,YAAY,MAAM;AACpB,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,UAAU;AAC/B,QAAI,QAAQ,KAAK,MAAM,IAAI;AACzB,aAAO;AAAA,IACT;AAEA,QAAI;AACF,aAAO,KAAK,MAAM,OAAO;AAAA,IAC3B,SAAS,QAAQ;AAEf,YAAM,WAAW,UAAU,KAAK,OAAO;AACvC,YAAM,SAAS,QAAQ,MAAM,GAAG,EAAE,EAAE,UAAU,EAAE,WAAW,GAAG;AAE9D,UAAI,CAAC,YAAY,QAAQ;AACvB,eAAO;AAAA,MACT;AAEA,aAAO,MAAM,SAAS;AAAA,QACpB,eAAe;AAAA,MACjB,CAAC;AAAA,IACH;AAAA,EACF;AAEA,SAAO;AACT;",
+  "sourcesContent": ["import { parse } from 'yaml'\n\n/**\n * Normalize a string (YAML, JSON, object) to a JavaScript datatype.\n */\nexport function normalize(content: any) {\n  if (content === null) {\n    return undefined\n  }\n\n  if (typeof content === 'string') {\n    if (content.trim() === '') {\n      return undefined\n    }\n\n    try {\n      return JSON.parse(content)\n    } catch (_error) {\n      // Does it look like YAML?\n      const hasColon = /^[^:]+:/.test(content)\n      const isJson = content.slice(0, 50).trimStart().startsWith('{')\n\n      if (!hasColon || isJson) {\n        return undefined\n      }\n\n      return parse(content, {\n        maxAliasCount: 10000,\n        merge: true,\n      })\n    }\n  }\n\n  return content\n}\n"],
+  "mappings": "AAAA,SAAS,aAAa;AAKf,SAAS,UAAU,SAAc;AACtC,MAAI,YAAY,MAAM;AACpB,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,UAAU;AAC/B,QAAI,QAAQ,KAAK,MAAM,IAAI;AACzB,aAAO;AAAA,IACT;AAEA,QAAI;AACF,aAAO,KAAK,MAAM,OAAO;AAAA,IAC3B,SAAS,QAAQ;AAEf,YAAM,WAAW,UAAU,KAAK,OAAO;AACvC,YAAM,SAAS,QAAQ,MAAM,GAAG,EAAE,EAAE,UAAU,EAAE,WAAW,GAAG;AAE9D,UAAI,CAAC,YAAY,QAAQ;AACvB,eAAO;AAAA,MACT;AAEA,aAAO,MAAM,SAAS;AAAA,QACpB,eAAe;AAAA,QACf,OAAO;AAAA,MACT,CAAC;AAAA,IACH;AAAA,EACF;AAEA,SAAO;AACT;",
   "names": []
 }

package/package.json

@@ -10,7 +10,7 @@
     "url": "git+https://github.com/scalar/scalar.git",
     "directory": "packages/json-magic"
   },
-  "version": "0.5.1",
+  "version": "0.6.0",
   "engines": {
     "node": ">=20"
   },
@@ -53,7 +53,6 @@
     }
   },
   "dependencies": {
-    "vue": "^3.5.17",
     "yaml": "2.8.0",
     "@scalar/helpers": "0.0.11"
   },

package/src/bundle/bundle.test.ts

@@ -1409,7 +1409,7 @@ describe('bundle', () => {
                   content: {
                     'application/json': {
                       schema: {
-                        $ref: 'https://example.com/root/schema#user-schema',
+                        $ref: 'https://example.com/root#user-schema',
                       },
                     },
                   },
@@ -1421,13 +1421,20 @@ describe('bundle', () => {
       }
 
       await bundle(input, {
-        plugins: [fetchUrls(), readFiles()],
+        plugins: [
+          fetchUrls({
+            fetch: async () => {
+              return Response.json({ message: 'should not be called' })
+            },
+          }),
+          readFiles(),
+        ],
         treeShake: false,
       })
 
       // The $ref should remain unchanged because the schema is already defined locally with $anchor
       expect(input.paths['/users'].get.responses['200'].content['application/json'].schema.$ref).toBe(
-        'https://example.com/root/schema#user-schema',
+        'https://example.com/root#user-schema',
       )
 
       // The external schema should not be bundled into x-ext
@@ -2056,7 +2063,7 @@ describe('bundle', () => {
 
   describe('bundle with a certain depth', () => {
     let server: FastifyInstance
-    const PORT = 7299
+    const PORT = 7298
     const url = `http://localhost:${PORT}`
 
     beforeEach(() => {

package/src/bundle/plugins/parse-yaml/index.ts

@@ -21,7 +21,7 @@ export function parseYaml(): LoaderPlugin {
       try {
         return {
           ok: true,
-          data: YAML.parse(value),
+          data: YAML.parse(value, { merge: true, maxAliasCount: 10000 }),
         }
       } catch {
         return {

package/src/helpers/normalize.ts

@@ -26,6 +26,7 @@ export function normalize(content: any) {
 
       return parse(content, {
         maxAliasCount: 10000,
+        merge: true,
       })
     }
   }