@stryke/json 0.8.3 → 0.9.1

package/README.md

@@ -22,15 +22,10 @@ This package is part of Storm Software's **🌩️ Stryke** monorepo. Stryke pac
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-0.8.1-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/stryke/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-0.9.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/stryke/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
-> [!IMPORTANT] This repository, and the apps, libraries, and tools contained
-> within, is still in it's initial development phase. As a result, bugs and
-> issues are expected with it's usage. When the main development phase
-> completes, a proper release will be performed, the packages will be availible
-> through NPM (and other distributions), and this message will be removed.
-> However, in the meantime, please feel free to report any issues you may come
-> across.
+> [!IMPORTANT] Important
+> This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and  issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be available through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.
 
 <div align="center">
 <b>Be sure to ⭐ this repository on <a href="https://github.com/storm-software/stryke" target="_blank">GitHub</a> so you can keep up to date on any daily progress!</b>
@@ -52,7 +47,6 @@ flexibility and customization.
 
 <!-- START doctoc -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
 ## Table of Contents
 
 - [Installing](#installing)

package/dist/index.cjs

@@ -24,4 +24,15 @@ Object.keys(_types).forEach(function (key) {
       return _types[key];
     }
   });
+});
+var _utils = require("./utils/index.cjs");
+Object.keys(_utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _utils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _utils[key];
+    }
+  });
 });

package/dist/index.d.ts

@@ -8,3 +8,4 @@
  */
 export * from "./storm-json";
 export * from "./types";
+export * from "./utils";

package/dist/index.mjs

@@ -1 +1 @@
-export*from"./storm-json";export*from"./types";
+export*from"./storm-json";export*from"./types";export*from"./utils";

package/dist/utils/index.cjs

@@ -14,6 +14,17 @@ Object.keys(_codeFrames).forEach(function (key) {
     }
   });
 });
+var _parse = require("./parse.cjs");
+Object.keys(_parse).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _parse[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _parse[key];
+    }
+  });
+});
 var _parseError = require("./parse-error.cjs");
 Object.keys(_parseError).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./code-frames";
+export * from "./parse";
 export * from "./parse-error";
 export * from "./stringify";
 export * from "./strip-comments";

package/dist/utils/index.mjs

@@ -1 +1 @@
-export*from"./code-frames";export*from"./parse-error";export*from"./stringify";export*from"./strip-comments";
+export*from"./code-frames";export*from"./parse";export*from"./parse-error";export*from"./stringify";export*from"./strip-comments";

package/dist/utils/parse.cjs

@@ -5,21 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parse = parse;
 exports.safeParse = safeParse;
-const e = /"(?:_|\\u0{2}5[Ff]){2}(?:p|\\u0{2}70)(?:r|\\u0{2}72)(?:o|\\u0{2}6[Ff])(?:t|\\u0{2}74)(?:o|\\u0{2}6[Ff])(?:_|\\u0{2}5[Ff]){2}"\s*:/,
-  o = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/,
+var _stripComments = require("./strip-comments.cjs");
+const o = /"(?:_|\\u0{2}5[Ff]){2}(?:p|\\u0{2}70)(?:r|\\u0{2}72)(?:o|\\u0{2}6[Ff])(?:t|\\u0{2}74)(?:o|\\u0{2}6[Ff])(?:_|\\u0{2}5[Ff]){2}"\s*:/,
+  u = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/,
   i = /^\s*["[{]|^\s*-?\d{1,16}(?:\.\d{1,17})?(?:E[+-]?\d+)?\s*$/i;
-function u(r, t) {
-  if (r === "__proto__" || r === "constructor" && t && typeof t == "object" && "prototype" in t) {
-    console.warn(`Dropping "${r}" key to prevent prototype pollution.`);
+function c(t, n) {
+  if (t === "__proto__" || t === "constructor" && n && typeof n == "object" && "prototype" in n) {
+    console.warn(`Dropping "${t}" key to prevent prototype pollution.`);
     return;
   }
-  return t;
+  return n;
 }
-function parse(r, t = {}) {
-  if (typeof r != "string") return r;
+function parse(t, n = {}) {
+  if (typeof t != "string") return t;
+  let r = (0, _stripComments.stripComments)(t);
   if (r[0] === '"' && r[r.length - 1] === '"' && !r.includes("\\")) return r.slice(1, -1);
-  const n = r.trim();
-  if (n.length <= 9) switch (n.toLowerCase()) {
+  if (r = r.trim(), r.length <= 9) switch (r.toLowerCase()) {
     case "true":
       return !0;
     case "false":
@@ -36,23 +37,23 @@ function parse(r, t = {}) {
       return Number.NEGATIVE_INFINITY;
   }
   if (!i.test(r)) {
-    if (t.strict) throw new Error("Invalid JSON");
+    if (n.strict) throw new Error("Invalid JSON");
     return r;
   }
   try {
-    if (e.test(r) || o.test(r)) {
-      if (t.strict) throw new Error("Possible prototype pollution");
-      return JSON.parse(r, u);
+    if (o.test(r) || u.test(r)) {
+      if (n.strict) throw new Error("Possible prototype pollution");
+      return JSON.parse(r, c);
     }
     return JSON.parse(r);
-  } catch (s) {
-    if (t.strict) throw s;
-    return r;
+  } catch (e) {
+    if (n.strict) throw e;
+    return t;
   }
 }
-function safeParse(r, t = {}) {
-  return parse(r, {
-    ...t,
+function safeParse(t, n = {}) {
+  return parse(t, {
+    ...n,
     strict: !0
   });
 }

package/dist/utils/parse.mjs

@@ -1 +1 @@
-const e=/"(?:_|\\u0{2}5[Ff]){2}(?:p|\\u0{2}70)(?:r|\\u0{2}72)(?:o|\\u0{2}6[Ff])(?:t|\\u0{2}74)(?:o|\\u0{2}6[Ff])(?:_|\\u0{2}5[Ff]){2}"\s*:/,o=/"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/,i=/^\s*["[{]|^\s*-?\d{1,16}(?:\.\d{1,17})?(?:E[+-]?\d+)?\s*$/i;function u(r,t){if(r==="__proto__"||r==="constructor"&&t&&typeof t=="object"&&"prototype"in t){console.warn(`Dropping "${r}" key to prevent prototype pollution.`);return}return t}export function parse(r,t={}){if(typeof r!="string")return r;if(r[0]==='"'&&r[r.length-1]==='"'&&!r.includes("\\"))return r.slice(1,-1);const n=r.trim();if(n.length<=9)switch(n.toLowerCase()){case"true":return!0;case"false":return!1;case"undefined":return;case"null":return null;case"nan":return Number.NaN;case"infinity":return Number.POSITIVE_INFINITY;case"-infinity":return Number.NEGATIVE_INFINITY}if(!i.test(r)){if(t.strict)throw new Error("Invalid JSON");return r}try{if(e.test(r)||o.test(r)){if(t.strict)throw new Error("Possible prototype pollution");return JSON.parse(r,u)}return JSON.parse(r)}catch(s){if(t.strict)throw s;return r}}export function safeParse(r,t={}){return parse(r,{...t,strict:!0})}
+import{stripComments as s}from"./strip-comments";const o=/"(?:_|\\u0{2}5[Ff]){2}(?:p|\\u0{2}70)(?:r|\\u0{2}72)(?:o|\\u0{2}6[Ff])(?:t|\\u0{2}74)(?:o|\\u0{2}6[Ff])(?:_|\\u0{2}5[Ff]){2}"\s*:/,u=/"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/,i=/^\s*["[{]|^\s*-?\d{1,16}(?:\.\d{1,17})?(?:E[+-]?\d+)?\s*$/i;function c(t,n){if(t==="__proto__"||t==="constructor"&&n&&typeof n=="object"&&"prototype"in n){console.warn(`Dropping "${t}" key to prevent prototype pollution.`);return}return n}export function parse(t,n={}){if(typeof t!="string")return t;let r=s(t);if(r[0]==='"'&&r[r.length-1]==='"'&&!r.includes("\\"))return r.slice(1,-1);if(r=r.trim(),r.length<=9)switch(r.toLowerCase()){case"true":return!0;case"false":return!1;case"undefined":return;case"null":return null;case"nan":return Number.NaN;case"infinity":return Number.POSITIVE_INFINITY;case"-infinity":return Number.NEGATIVE_INFINITY}if(!i.test(r)){if(n.strict)throw new Error("Invalid JSON");return r}try{if(o.test(r)||u.test(r)){if(n.strict)throw new Error("Possible prototype pollution");return JSON.parse(r,c)}return JSON.parse(r)}catch(e){if(n.strict)throw e;return t}}export function safeParse(t,n={}){return parse(t,{...n,strict:!0})}

package/dist/utils/strip-comments.cjs

@@ -3,10 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "stripComments", {
-  enumerable: true,
-  get: function () {
-    return _jsoncParser.stripComments;
+exports.stripComments = stripComments;
+var _base = require("@stryke/types/base");
+const h = Symbol("singleComment"),
+  a = Symbol("multiComment");
+function d() {
+  return "";
+}
+function C(t, f, c) {
+  return t.slice(f, c).replace(/\S/g, " ");
+}
+function y(t, f) {
+  let c = f - 1,
+    o = 0;
+  for (; t[c] === "\\";) c -= 1, o += 1;
+  return !!(o % 2);
+}
+function stripComments(t, {
+  whitespace: f = !0,
+  trailingCommas: c = !1
+} = {}) {
+  if (typeof t != "string") throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof t}\``);
+  const o = f ? C : d;
+  let g = !1,
+    i = !1,
+    s = 0,
+    n = "",
+    b = "",
+    l = -1;
+  for (let e = 0; e < t.length; e++) {
+    const r = t[e],
+      m = t[e + 1];
+    !i && r === '"' && (y(t, e) || (g = !g)), !g && (!i && r + (m ?? _base.EMPTY_STRING) === "//" ? (n += t.slice(s, e), s = e, i = h, e++) : i === h && r + (m ?? _base.EMPTY_STRING) === `\r
+` ? (e++, i = !1, n += o(t, s, e), s = e) : i === h && r === `
+` ? (i = !1, n += o(t, s, e), s = e) : !i && r + (m ?? _base.EMPTY_STRING) === "/*" ? (n += t.slice(s, e), s = e, i = a, e++) : i === a && r + (m ?? _base.EMPTY_STRING) === "*/" ? (e++, i = !1, n += o(t, s, e + 1), s = e + 1) : c && !i && (l !== -1 ? r === "}" || r === "]" ? (n += t.slice(s, e), b += o(n, 0, 1) + n.slice(1), n = "", s = e, l = -1) : r !== " " && r !== "	" && r !== "\r" && r !== `
+` && (n += t.slice(s, e), s = e, l = -1) : r === "," && (b += n + t.slice(s, e), n = "", s = e, l = e)));
   }
-});
-var _jsoncParser = require("jsonc-parser");
+  return b + n + (i ? o(t.slice(s)) : t.slice(s));
+}

package/dist/utils/strip-comments.d.ts

@@ -1 +1,4 @@
-export { stripComments } from "jsonc-parser";
+export declare function stripComments(value: string, { whitespace, trailingCommas }?: {
+    whitespace?: boolean | undefined;
+    trailingCommas?: boolean | undefined;
+}): string;

package/dist/utils/strip-comments.mjs

@@ -1 +1,4 @@
-export{stripComments}from"jsonc-parser";
+import{EMPTY_STRING as p}from"@stryke/types/base";const h=Symbol("singleComment"),a=Symbol("multiComment");function d(){return""}function C(t,f,c){return t.slice(f,c).replace(/\S/g," ")}function y(t,f){let c=f-1,o=0;for(;t[c]==="\\";)c-=1,o+=1;return!!(o%2)}export function stripComments(t,{whitespace:f=!0,trailingCommas:c=!1}={}){if(typeof t!="string")throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof t}\``);const o=f?C:d;let g=!1,i=!1,s=0,n="",b="",l=-1;for(let e=0;e<t.length;e++){const r=t[e],m=t[e+1];!i&&r==='"'&&(y(t,e)||(g=!g)),!g&&(!i&&r+(m??p)==="//"?(n+=t.slice(s,e),s=e,i=h,e++):i===h&&r+(m??p)===`\r
+`?(e++,i=!1,n+=o(t,s,e),s=e):i===h&&r===`
+`?(i=!1,n+=o(t,s,e),s=e):!i&&r+(m??p)==="/*"?(n+=t.slice(s,e),s=e,i=a,e++):i===a&&r+(m??p)==="*/"?(e++,i=!1,n+=o(t,s,e+1),s=e+1):c&&!i&&(l!==-1?r==="}"||r==="]"?(n+=t.slice(s,e),b+=o(n,0,1)+n.slice(1),n="",s=e,l=-1):r!==" "&&r!=="	"&&r!=="\r"&&r!==`
+`&&(n+=t.slice(s,e),s=e,l=-1):r===","&&(b+=n+t.slice(s,e),n="",s=e,l=e)))}return b+n+(i?o(t.slice(s)):t.slice(s))}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/json",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "type": "module",
   "description": "A package containing JSON parsing/stringify utilities used by Storm Software.",
   "repository": {
@@ -11,7 +11,6 @@
   "private": false,
   "dependencies": {
     "buffer": "6.0.3",
-    "jsonc-parser": "3.3.1",
     "lines-and-columns": "2.0.4",
     "superjson": "2.2.2",
     "@stryke/type-checks": "^0.3.3",