pg-sql2 5.0.0-rc.3 → 5.0.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # pg-sql2
 
+## 5.0.0-rc.4
+
+### Patch Changes
+
+- [`a3722d6`](https://github.com/graphile/crystal/commit/a3722d613bc6fb9e32f167aae9a31eaa422ceef1)
+  Thanks [@benjie](https://github.com/benjie)! - Refactor to enable TypeScript
+  options rewriteRelativeImportExtensions and erasableSyntaxOnly (including
+  using .ts extensions in source code)
+- Updated dependencies
+  [[`a3722d6`](https://github.com/graphile/crystal/commit/a3722d613bc6fb9e32f167aae9a31eaa422ceef1)]:
+  - @graphile/lru@5.0.0-rc.4
+
 ## 5.0.0-rc.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { $$type } from "./thereCanBeOnlyOne.js";
-export { version } from "./version.js";
+import { $$type } from "./thereCanBeOnlyOne.ts";
+export { version } from "./version.ts";
 /** Use this to enable coercing objects to SQL to make composing SQL fragments more ergonomic */
 export declare const $$toSQL: unique symbol;
 /** Experimental! */

package/dist/index.js

@@ -24,9 +24,9 @@ const tslib_1 = require("tslib");
 const lru_1 = tslib_1.__importDefault(require("@graphile/lru"));
 const assert = tslib_1.__importStar(require("assert"));
 const util_1 = require("util");
-const thereCanBeOnlyOne_js_1 = require("./thereCanBeOnlyOne.js");
-var version_js_1 = require("./version.js");
-Object.defineProperty(exports, "version", { enumerable: true, get: function () { return version_js_1.version; } });
+const thereCanBeOnlyOne_ts_1 = require("./thereCanBeOnlyOne.js");
+var version_ts_1 = require("./version.js");
+Object.defineProperty(exports, "version", { enumerable: true, get: function () { return version_ts_1.version; } });
 /** Use this to enable coercing objects to SQL to make composing SQL fragments more ergonomic */
 exports.$$toSQL = Symbol("toSQL");
 function exportAs(thing, exportName) {
@@ -50,7 +50,7 @@ const isDev = typeof process !== "undefined" &&
         process.env.GRAPHILE_ENV === "test");
 const defaultIncludeComments = isDev || (typeof process !== "undefined" && process.env.PGSQL2_DEBUG === "1");
 const nodeInspect = function (depth, options) {
-    if (this[thereCanBeOnlyOne_js_1.$$type] === "VALUE") {
+    if (this[thereCanBeOnlyOne_ts_1.$$type] === "VALUE") {
         if (depth < 0) {
             return `sql.value(...)`;
         }
@@ -59,22 +59,22 @@ const nodeInspect = function (depth, options) {
             depth: options.depth == null ? null : options.depth - 1,
         })})`;
     }
-    else if (this[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+    else if (this[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
         return `sql\`${this.t}\``;
     }
-    else if (this[thereCanBeOnlyOne_js_1.$$type] === "IDENTIFIER") {
+    else if (this[thereCanBeOnlyOne_ts_1.$$type] === "IDENTIFIER") {
         return `sql.identifier(${JSON.stringify(this.n)})`;
     }
-    else if (this[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+    else if (this[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
         if (depth < 0) {
             return `sql\`...\``;
         }
         else {
-            return `sql\`${this.n.map((n) => (n[thereCanBeOnlyOne_js_1.$$type] === "RAW" ? n.t : "${" + nodeInspect.call(n, depth + 1, options) + "}")).join("")}\``;
+            return `sql\`${this.n.map((n) => (n[thereCanBeOnlyOne_ts_1.$$type] === "RAW" ? n.t : "${" + nodeInspect.call(n, depth + 1, options) + "}")).join("")}\``;
         }
     }
     else {
-        return `sql{${this[thereCanBeOnlyOne_js_1.$$type]}}`;
+        return `sql{${this[thereCanBeOnlyOne_ts_1.$$type]}}`;
     }
 };
 const pgSQL2Proto = Object.assign(Object.create(null), {
@@ -136,7 +136,7 @@ function makeRawNode(text, exportName) {
     }
     const newNode = {
         __proto__: pgSQL2Proto,
-        [thereCanBeOnlyOne_js_1.$$type]: "RAW",
+        [thereCanBeOnlyOne_ts_1.$$type]: "RAW",
         t: text,
     };
     if (exportName) {
@@ -156,7 +156,7 @@ function makeCommentNode(rawCommentText) {
         .replace(/\/\*/g, "/ *");
     const newNode = {
         __proto__: pgSQL2Proto,
-        [thereCanBeOnlyOne_js_1.$$type]: "COMMENT",
+        [thereCanBeOnlyOne_ts_1.$$type]: "COMMENT",
         commentText,
     };
     return newNode;
@@ -165,7 +165,7 @@ function makeCommentNode(rawCommentText) {
 function makeIdentifierNode(s, n = getSymbolName(s)) {
     return Object.freeze({
         __proto__: pgSQL2Proto,
-        [thereCanBeOnlyOne_js_1.$$type]: "IDENTIFIER",
+        [thereCanBeOnlyOne_ts_1.$$type]: "IDENTIFIER",
         s,
         n,
     });
@@ -174,30 +174,30 @@ function makeIdentifierNode(s, n = getSymbolName(s)) {
 function makeValueNode(rawValue) {
     return Object.freeze({
         __proto__: pgSQL2Proto,
-        [thereCanBeOnlyOne_js_1.$$type]: "VALUE",
+        [thereCanBeOnlyOne_ts_1.$$type]: "VALUE",
         v: rawValue,
     });
 }
 function makeIndentNode(content) {
-    const flags = content[thereCanBeOnlyOne_js_1.$$type] === "QUERY" ? content.f : 0;
+    const flags = content[thereCanBeOnlyOne_ts_1.$$type] === "QUERY" ? content.f : 0;
     return Object.freeze({
-        [thereCanBeOnlyOne_js_1.$$type]: "INDENT",
+        [thereCanBeOnlyOne_ts_1.$$type]: "INDENT",
         f: flags,
-        c: content[thereCanBeOnlyOne_js_1.$$type] === "QUERY"
+        c: content[thereCanBeOnlyOne_ts_1.$$type] === "QUERY"
             ? content
             : makeQueryNode([enforceValidNode(content)]),
     });
 }
 function makeSymbolAliasNode(a, b) {
     return Object.freeze({
-        [thereCanBeOnlyOne_js_1.$$type]: "SYMBOL_ALIAS",
+        [thereCanBeOnlyOne_ts_1.$$type]: "SYMBOL_ALIAS",
         a: a,
         b: b,
     });
 }
 function makePlaceholderNode(symbol, fallback) {
     return Object.freeze({
-        [thereCanBeOnlyOne_js_1.$$type]: "PLACEHOLDER",
+        [thereCanBeOnlyOne_ts_1.$$type]: "PLACEHOLDER",
         s: symbol,
         k: fallback,
     });
@@ -205,7 +205,7 @@ function makePlaceholderNode(symbol, fallback) {
 function makeQueryNode(nodes, flags = 0) {
     let checksum = 0;
     for (const node of nodes) {
-        switch (node[thereCanBeOnlyOne_js_1.$$type]) {
+        switch (node[thereCanBeOnlyOne_ts_1.$$type]) {
             case "RAW": {
                 const { t } = node;
                 // Max value of charCodeAt is 65535. 65535 * 10000 < 2^30.
@@ -238,14 +238,14 @@ function makeQueryNode(nodes, flags = 0) {
                 break;
             }
             default: {
-                const never = node[thereCanBeOnlyOne_js_1.$$type];
+                const never = node[thereCanBeOnlyOne_ts_1.$$type];
                 throw new Error(`Unrecognized node type ${never}`);
             }
         }
     }
     return Object.freeze({
         __proto__: pgSQL2Proto,
-        [thereCanBeOnlyOne_js_1.$$type]: "QUERY",
+        [thereCanBeOnlyOne_ts_1.$$type]: "QUERY",
         n: nodes,
         f: flags,
         c: checksum,
@@ -254,7 +254,7 @@ function makeQueryNode(nodes, flags = 0) {
 function isSQL(node) {
     return (typeof node === "object" &&
         node !== null &&
-        typeof node[thereCanBeOnlyOne_js_1.$$type] === "string");
+        typeof node[thereCanBeOnlyOne_ts_1.$$type] === "string");
 }
 function isSQLable(value) {
     return (typeof value === "object" &&
@@ -333,19 +333,19 @@ function compile(sql, options) {
          * Join this to generate the SQL query
          */
         const sqlFragments = [];
-        const trustedInput = untrustedInput?.[thereCanBeOnlyOne_js_1.$$type] !== undefined
+        const trustedInput = untrustedInput?.[thereCanBeOnlyOne_ts_1.$$type] !== undefined
             ? untrustedInput
             : enforceValidNode(untrustedInput, ``);
-        const items = trustedInput[thereCanBeOnlyOne_js_1.$$type] === "QUERY"
+        const items = trustedInput[thereCanBeOnlyOne_ts_1.$$type] === "QUERY"
             ? expandQueryNodes(trustedInput)
             : [trustedInput];
         const itemCount = items.length;
         for (let itemIndex = 0; itemIndex < itemCount; itemIndex++) {
             const itemAtIndex = items[itemIndex];
-            const item = itemAtIndex?.[thereCanBeOnlyOne_js_1.$$type] !== undefined
+            const item = itemAtIndex?.[thereCanBeOnlyOne_ts_1.$$type] !== undefined
                 ? itemAtIndex
                 : enforceValidNode(itemAtIndex, `item ${itemIndex}`);
-            switch (item[thereCanBeOnlyOne_js_1.$$type]) {
+            switch (item[thereCanBeOnlyOne_ts_1.$$type]) {
                 case "RAW": {
                     if (item.t === "") {
                         // No need to add blank raw text!
@@ -492,19 +492,19 @@ const sqlBase = function sql(strings, ...values) {
         currentText += text;
         if (i < l - 1) {
             const rawVal = values[i];
-            const valid = rawVal?.[thereCanBeOnlyOne_js_1.$$type] !== undefined
+            const valid = rawVal?.[thereCanBeOnlyOne_ts_1.$$type] !== undefined
                 ? rawVal
                 : enforceValidNode(rawVal, `template literal placeholder ${i}`);
-            if (valid[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+            if (valid[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
                 currentText += valid.t;
             }
-            else if (valid[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+            else if (valid[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
                 // NOTE: this clears the flags
                 const nodes = expandQueryNodes(valid);
                 const nodeCount = nodes.length;
                 for (let nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++) {
                     const node = nodes[nodeIndex];
-                    if (node[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+                    if (node[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
                         currentText += node.t;
                     }
                     else {
@@ -671,7 +671,7 @@ function join(items, separator = "") {
     }
     else if (items.length === 1) {
         const rawNode = items[0];
-        const node = rawNode?.[thereCanBeOnlyOne_js_1.$$type] !== undefined
+        const node = rawNode?.[thereCanBeOnlyOne_ts_1.$$type] !== undefined
             ? rawNode
             : enforceValidNode(rawNode, `join item ${0}`);
         return node;
@@ -682,15 +682,15 @@ function join(items, separator = "") {
     for (let i = 0, l = items.length; i < l; i++) {
         const rawNode = items[i];
         const addSeparator = i > 0 && hasSeparator;
-        const node = rawNode?.[thereCanBeOnlyOne_js_1.$$type] !== undefined
+        const node = rawNode?.[thereCanBeOnlyOne_ts_1.$$type] !== undefined
             ? rawNode
             : enforceValidNode(rawNode, `join item ${i}`);
         if (addSeparator) {
             currentText += separator;
         }
-        if (node[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+        if (node[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
             for (const innerNode of expandQueryNodes(node)) {
-                if (innerNode[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+                if (innerNode[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
                     currentText += innerNode.t;
                 }
                 else {
@@ -702,7 +702,7 @@ function join(items, separator = "") {
                 }
             }
         }
-        else if (node[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+        else if (node[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
             currentText += node.t;
         }
         else {
@@ -753,7 +753,7 @@ function isIdentifierLike(p) {
 }
 function parenthesize(fragment, inFlags = 0) {
     const flags = inFlags | FLAG_HAS_PARENS;
-    if (fragment[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+    if (fragment[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
         return makeQueryNode(fragment.n, flags);
     }
     else {
@@ -785,7 +785,7 @@ function parenthesize(fragment, inFlags = 0) {
  * - An identifier `table.column.attribute` / `"MyTaBlE"."MyCoLuMn"."MyAtTrIbUtE"` (this needs to be `(table.column).attribute`)
  */
 function parens(frag, force) {
-    if (frag[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+    if (frag[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
         if ((frag.f & FLAG_HAS_PARENS) === FLAG_HAS_PARENS) {
             return frag;
         }
@@ -804,8 +804,8 @@ function parens(frag, force) {
             // Check for `IDENTIFIER.rawtext`
             // ENHANCE: check for 'rawtext.IDENTIFIER' too
             const [identifier, rawtext] = nodes;
-            if (identifier[thereCanBeOnlyOne_js_1.$$type] !== "IDENTIFIER" ||
-                rawtext[thereCanBeOnlyOne_js_1.$$type] !== "RAW" ||
+            if (identifier[thereCanBeOnlyOne_ts_1.$$type] !== "IDENTIFIER" ||
+                rawtext[thereCanBeOnlyOne_ts_1.$$type] !== "RAW" ||
                 !rawtext.t.startsWith(".")) {
                 return parenthesize(frag);
             }
@@ -820,13 +820,13 @@ function parens(frag, force) {
             for (let i = 0; i < nodeCount; i++) {
                 const node = nodes[i];
                 if (i % 2 === 0) {
-                    if (node[thereCanBeOnlyOne_js_1.$$type] !== "IDENTIFIER" &&
-                        (node[thereCanBeOnlyOne_js_1.$$type] !== "RAW" || !isIdentifierLike(node.t))) {
+                    if (node[thereCanBeOnlyOne_ts_1.$$type] !== "IDENTIFIER" &&
+                        (node[thereCanBeOnlyOne_ts_1.$$type] !== "RAW" || !isIdentifierLike(node.t))) {
                         return parenthesize(frag);
                     }
                 }
                 else {
-                    if (node[thereCanBeOnlyOne_js_1.$$type] !== "RAW" || node.t !== ".") {
+                    if (node[thereCanBeOnlyOne_ts_1.$$type] !== "RAW" || node.t !== ".") {
                         return parenthesize(frag);
                     }
                 }
@@ -837,9 +837,9 @@ function parens(frag, force) {
             return parenthesize(frag);
         }
     }
-    else if (frag[thereCanBeOnlyOne_js_1.$$type] === "INDENT") {
+    else if (frag[thereCanBeOnlyOne_ts_1.$$type] === "INDENT") {
         const inner = parens(frag.c, force);
-        if (inner[thereCanBeOnlyOne_js_1.$$type] === "QUERY" &&
+        if (inner[thereCanBeOnlyOne_ts_1.$$type] === "QUERY" &&
             (inner.f & FLAG_HAS_PARENS) === FLAG_HAS_PARENS) {
             // Move the parens to outside
             return parenthesize(indent(makeQueryNode(inner.n)), inner.f);
@@ -854,16 +854,16 @@ function parens(frag, force) {
     else if (force) {
         return parenthesize(frag);
     }
-    else if (frag[thereCanBeOnlyOne_js_1.$$type] === "VALUE") {
+    else if (frag[thereCanBeOnlyOne_ts_1.$$type] === "VALUE") {
         return frag;
     }
-    else if (frag[thereCanBeOnlyOne_js_1.$$type] === "IDENTIFIER") {
+    else if (frag[thereCanBeOnlyOne_ts_1.$$type] === "IDENTIFIER") {
         return frag;
     }
-    else if (frag[thereCanBeOnlyOne_js_1.$$type] === "COMMENT") {
+    else if (frag[thereCanBeOnlyOne_ts_1.$$type] === "COMMENT") {
         return frag;
     }
-    else if (frag[thereCanBeOnlyOne_js_1.$$type] === "RAW") {
+    else if (frag[thereCanBeOnlyOne_ts_1.$$type] === "RAW") {
         const expr = frag.t;
         if (expr.match(NUMBER_REGEX_1) || expr.match(NUMBER_REGEX_2)) {
             return frag;
@@ -924,31 +924,31 @@ function isEquivalent(sql1, sql2, options) {
     if (sql1 === sql2) {
         return true;
     }
-    else if (sql1[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
-        if (sql2[thereCanBeOnlyOne_js_1.$$type] !== "QUERY" || sql2.f !== sql1.f || sql2.c !== sql1.c) {
+    else if (sql1[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
+        if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== "QUERY" || sql2.f !== sql1.f || sql2.c !== sql1.c) {
             return false;
         }
         return arraysMatch(sql1.n, sql2.n, (a, b) => isEquivalent(a, b, options));
     }
-    else if (sql2[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+    else if (sql2[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
         return false;
     }
     else {
-        switch (sql1[thereCanBeOnlyOne_js_1.$$type]) {
+        switch (sql1[thereCanBeOnlyOne_ts_1.$$type]) {
             case "RAW": {
-                if (sql2[thereCanBeOnlyOne_js_1.$$type] !== sql1[thereCanBeOnlyOne_js_1.$$type]) {
+                if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== sql1[thereCanBeOnlyOne_ts_1.$$type]) {
                     return false;
                 }
                 return sql1.t === sql2.t;
             }
             case "VALUE": {
-                if (sql2[thereCanBeOnlyOne_js_1.$$type] !== sql1[thereCanBeOnlyOne_js_1.$$type]) {
+                if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== sql1[thereCanBeOnlyOne_ts_1.$$type]) {
                     return false;
                 }
                 return sql1.v === sql2.v;
             }
             case "INDENT": {
-                if (sql2[thereCanBeOnlyOne_js_1.$$type] !== sql1[thereCanBeOnlyOne_js_1.$$type]) {
+                if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== sql1[thereCanBeOnlyOne_ts_1.$$type]) {
                     return false;
                 }
                 return isEquivalent(sql1.c, sql2.c, options);
@@ -957,7 +957,7 @@ function isEquivalent(sql1, sql2, options) {
                 return true;
             }
             case "IDENTIFIER": {
-                if (sql2[thereCanBeOnlyOne_js_1.$$type] !== sql1[thereCanBeOnlyOne_js_1.$$type]) {
+                if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== sql1[thereCanBeOnlyOne_ts_1.$$type]) {
                     return false;
                 }
                 const { n: ids1n, s: ids1s } = sql1;
@@ -970,7 +970,7 @@ function isEquivalent(sql1, sql2, options) {
                 return namesMatch && symbolsMatch;
             }
             case "PLACEHOLDER": {
-                if (sql2[thereCanBeOnlyOne_js_1.$$type] !== sql1[thereCanBeOnlyOne_js_1.$$type]) {
+                if (sql2[thereCanBeOnlyOne_ts_1.$$type] !== sql1[thereCanBeOnlyOne_ts_1.$$type]) {
                     return false;
                 }
                 const symbolSubstitutes = options?.symbolSubstitutes;
@@ -991,7 +991,7 @@ function isEquivalent(sql1, sql2, options) {
     }
 }
 function replaceSymbolInNode(frag, needle, replacement) {
-    switch (frag[thereCanBeOnlyOne_js_1.$$type]) {
+    switch (frag[thereCanBeOnlyOne_ts_1.$$type]) {
         case "COMMENT":
         case "RAW": {
             return frag;
@@ -1033,7 +1033,7 @@ function replaceSymbolInNode(frag, needle, replacement) {
         }
         default: {
             const never = frag;
-            throw new Error(`Unhandled SQL type ${never[thereCanBeOnlyOne_js_1.$$type]}`);
+            throw new Error(`Unhandled SQL type ${never[thereCanBeOnlyOne_ts_1.$$type]}`);
         }
     }
 }
@@ -1041,7 +1041,7 @@ function replaceSymbolInNode(frag, needle, replacement) {
  * @experimental
  */
 function replaceSymbol(frag, needle, replacement) {
-    if (frag[thereCanBeOnlyOne_js_1.$$type] === "QUERY") {
+    if (frag[thereCanBeOnlyOne_ts_1.$$type] === "QUERY") {
         let changed = false;
         const newNodes = frag.n.map((node) => {
             const newNode = replaceSymbolInNode(node, needle, replacement);
@@ -1094,7 +1094,7 @@ function withTransformer(transformer, callback) {
 }
 /** If node is an identifier, return its symbol, otherwise return null */
 function getIdentifierSymbol(potentialIdentifier) {
-    if (potentialIdentifier[thereCanBeOnlyOne_js_1.$$type] === "IDENTIFIER") {
+    if (potentialIdentifier[thereCanBeOnlyOne_ts_1.$$type] === "IDENTIFIER") {
         return potentialIdentifier.s;
     }
     else {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.0.0-rc.3";
+export declare const version = "5.0.0-rc.4";
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // This file is autogenerated by /scripts/postversion.mjs
-exports.version = "5.0.0-rc.3";
+exports.version = "5.0.0-rc.4";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-sql2",
-  "version": "5.0.0-rc.3",
+  "version": "5.0.0-rc.4",
   "description": "Generate safe Postgres-compliant SQL with tagged template literals",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,7 +44,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@graphile/lru": "^5.0.0-rc.3",
+    "@graphile/lru": "^5.0.0-rc.4",
     "tslib": "^2.8.1"
   },
   "files": [