sql-formatter - npm Package Compare versions

Comparing version 15.7.3 to 15.7.4

AUTHORS

@@ -49,2 +49,3 @@ Rene Saarsoo <[e-mail]>
 Nicolas Dermine <[e-mail]>
+nuintun <[e-mail]>
 Offir Baron <[e-mail]>
@@ -63,2 +64,3 @@ Olexandr Sydorchuk <[e-mail]>
 Sergei Egorov <[e-mail]>
+Sai Asish Y <[e-mail]>
 Shub <[e-mail]>
@@ -65,0 +67,0 @@ Stanislav Germanovskii <[e-mail]>

dist/cjs/languages/sqlite/sqlite.formatter.js

@@ -86,3 +86,15 @@ "use strict";
         // https://www.sqlite.org/lang_expr.html#parameters
-        paramTypes: { positional: true, numbered: ['?'], named: [':', '@', '$'] },
+        // Note: the $-prefixed form follows Tcl variable syntax and may include
+        // one or more "::"-separated suffixes and an optional "(...)" trailer.
+        paramTypes: {
+            positional: true,
+            numbered: ['?'],
+            named: [':', '@'],
+            custom: [
+                {
+                    regex: String.raw `\$[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z_][a-zA-Z0-9_]*)*(?:\([^)]*\))?`,
+                    key: v => v.slice(1),
+                },
+            ],
+        },
         operators: ['%', '~', '&', '|', '<<', '>>', '==', '->', '->>', '||'],
@@ -89,0 +101,0 @@ },

dist/cjs/languages/sqlite/sqlite.formatter.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"sqlite.formatter.js","sourceRoot":"","sources":["../../../../src/languages/sqlite/sqlite.formatter.ts"],"names":[],"mappings":";;;AACA,6DAAuD;AACvD,+DAAkD;AAClD,6DAA2D;AAE3D,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAElE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAC;IACpC,UAAU;IACV,kBAAkB;IAClB,MAAM;IACN,OAAO;IACP,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,cAAc;IACd,UAAU;IACV,OAAO;IACP,QAAQ;IACR,oBAAoB;IACpB,YAAY;IACZ,yEAAyE;IACzE,cAAc;IACd,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,SAAS;IACT,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,IAAA,gCAAa,EAAC,CAAC,iDAAiD,CAAC,CAAC,CAAC;AAElG,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAC;IAC1C,YAAY;IACZ,gDAAgD;IAChD,YAAY;IACZ,oEAAoE;IACpE,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,aAAa;IACb,gBAAgB;IAChB,wBAAwB;IACxB,iBAAiB;IACjB,aAAa;IACb,cAAc;IACd,eAAe;IACf,iBAAiB;IACjB,WAAW;IACX,eAAe;IACf,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,IAAA,gCAAa,EAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AAEpF,2DAA2D;AAC3D,MAAM,aAAa,GAAG,IAAA,gCAAa,EAAC;IAClC,MAAM;IACN,oCAAoC;IACpC,sBAAsB;IACtB,sBAAsB;IACtB,4CAA4C;CAC7C,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,IAAA,gCAAa,EAAC;IAC3C,+CAA+C;IAC/C,iCAAiC;IACjC,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,IAAA,gCAAa,EAAC,EAAE,CAAC,CAAC;AAErC,QAAA,MAAM,GAAmB;IACpC,IAAI,EAAE,QAAQ;IACd,gBAAgB,EAAE;QAChB,cAAc;QACd,eAAe,EAAE,CAAC,GAAG,eAAe,EAAE,GAAG,sBAAsB,EAAE,GAAG,qBAAqB,CAAC;QAC1F,qBAAqB;QACrB,aAAa;QACb,sBAAsB;QACtB,uBAAuB;QACvB,gBAAgB,EAAE,6BAAQ;QAC1B,iBAAiB,EAAE,8BAAS;QAC5B,qBAAqB,EAAE,+BAAS;QAChC,WAAW,EAAE;YACX,OAAO;YACP,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE;YACzD,uEAAuE;YACvE,qCAAqC;SACtC;QACD,UAAU,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;QACjC,mDAAmD;QACnD,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;QACzE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC;KACrE;IACD,aAAa,EAAE;QACb,cAAc,EAAE,CAAC,GAAG,sBAAsB,EAAE,GAAG,qBAAqB,CAAC;QACrE,qBAAqB;KACtB;CACF,CAAC"}
+{"version":3,"file":"sqlite.formatter.js","sourceRoot":"","sources":["../../../../src/languages/sqlite/sqlite.formatter.ts"],"names":[],"mappings":"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"}

dist/esm/languages/sqlite/sqlite.formatter.js

@@ -83,3 +83,15 @@ import { expandPhrases } from '../../expandPhrases.js';
         // https://www.sqlite.org/lang_expr.html#parameters
-        paramTypes: { positional: true, numbered: ['?'], named: [':', '@', '$'] },
+        // Note: the $-prefixed form follows Tcl variable syntax and may include
+        // one or more "::"-separated suffixes and an optional "(...)" trailer.
+        paramTypes: {
+            positional: true,
+            numbered: ['?'],
+            named: [':', '@'],
+            custom: [
+                {
+                    regex: String.raw `\$[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z_][a-zA-Z0-9_]*)*(?:\([^)]*\))?`,
+                    key: v => v.slice(1),
+                },
+            ],
+        },
         operators: ['%', '~', '&', '|', '<<', '>>', '==', '->', '->>', '||'],
@@ -86,0 +98,0 @@ },

dist/esm/languages/sqlite/sqlite.formatter.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"sqlite.formatter.js","sourceRoot":"","sources":["../../../../src/languages/sqlite/sqlite.formatter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAElE,MAAM,eAAe,GAAG,aAAa,CAAC;IACpC,UAAU;IACV,kBAAkB;IAClB,MAAM;IACN,OAAO;IACP,UAAU;IACV,QAAQ;IACR,QAAQ;IACR,cAAc;IACd,UAAU;IACV,OAAO;IACP,QAAQ;IACR,oBAAoB;IACpB,YAAY;IACZ,yEAAyE;IACzE,cAAc;IACd,QAAQ;IACR,YAAY;IACZ,KAAK;IACL,SAAS;IACT,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,aAAa,CAAC,CAAC,iDAAiD,CAAC,CAAC,CAAC;AAElG,MAAM,qBAAqB,GAAG,aAAa,CAAC;IAC1C,YAAY;IACZ,gDAAgD;IAChD,YAAY;IACZ,oEAAoE;IACpE,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,aAAa;IACb,gBAAgB;IAChB,wBAAwB;IACxB,iBAAiB;IACjB,aAAa;IACb,cAAc;IACd,eAAe;IACf,iBAAiB;IACjB,WAAW;IACX,eAAe;IACf,YAAY;CACb,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,aAAa,CAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AAEpF,2DAA2D;AAC3D,MAAM,aAAa,GAAG,aAAa,CAAC;IAClC,MAAM;IACN,oCAAoC;IACpC,sBAAsB;IACtB,sBAAsB;IACtB,4CAA4C;CAC7C,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,aAAa,CAAC;IAC3C,+CAA+C;IAC/C,iCAAiC;IACjC,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,uBAAuB,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,MAAM,GAAmB;IACpC,IAAI,EAAE,QAAQ;IACd,gBAAgB,EAAE;QAChB,cAAc;QACd,eAAe,EAAE,CAAC,GAAG,eAAe,EAAE,GAAG,sBAAsB,EAAE,GAAG,qBAAqB,CAAC;QAC1F,qBAAqB;QACrB,aAAa;QACb,sBAAsB;QACtB,uBAAuB;QACvB,gBAAgB,EAAE,QAAQ;QAC1B,iBAAiB,EAAE,SAAS;QAC5B,qBAAqB,EAAE,SAAS;QAChC,WAAW,EAAE;YACX,OAAO;YACP,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE;YACzD,uEAAuE;YACvE,qCAAqC;SACtC;QACD,UAAU,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;QACjC,mDAAmD;QACnD,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;QACzE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC;KACrE;IACD,aAAa,EAAE;QACb,cAAc,EAAE,CAAC,GAAG,sBAAsB,EAAE,GAAG,qBAAqB,CAAC;QACrE,qBAAqB;KACtB;CACF,CAAC"}
+{"version":3,"file":"sqlite.formatter.js","sourceRoot":"","sources":["../../../../src/languages/sqlite/sqlite.formatter.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "sql-formatter",
-  "version": "15.7.3",
+  "version": "15.7.4",
   "description": "Format whitespace in a SQL query to make it more readable",
@@ -5,0 +5,0 @@ "license": "MIT",

New alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Fixed alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Improved metrics

Total package byte prevSize

3107695

0.06%

Lines of code

46752

0.05%

No dependency changes