@ts-safeql/generate - npm Package Compare versions

Comparing version 3.0.0-next.2 to 3.0.0-next.3

lib/src/utils/get-json-target-types.js

@@ -6,16 +6,15 @@ "use strict";
 function getJsonTargets(pgParsed, resolvedStatement) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const targets = [];
     for (const target of (_c = (_b = (_a = pgParsed.stmts[0].stmt) === null || _a === void 0 ? void 0 : _a.SelectStmt) === null || _b === void 0 ? void 0 : _b.targetList) !== null && _c !== void 0 ? _c : []) {
-        if (((_e = (_d = target.ResTarget) === null || _d === void 0 ? void 0 : _d.val) === null || _e === void 0 ? void 0 : _e.FuncCall) === undefined) {
-            continue;
+        if (((_d = target.ResTarget) === null || _d === void 0 ? void 0 : _d.val) !== undefined) {
+            const targetType = getNodeJsonTarget({
+                node: target.ResTarget.val,
+                name: target.ResTarget.name,
+                resolvedStatement: resolvedStatement,
+            });
+            if (targetType !== undefined) {
+                targets.push(targetType);
+            }
         }
-        const targetType = getFunCallJsonTarget({
-            funcCall: target.ResTarget.val.FuncCall,
-            targetName: target.ResTarget.name,
-            resolvedStatement: resolvedStatement,
-        });
-        if (targetType !== undefined) {
-            targets.push(targetType);
-        }
     }
@@ -47,2 +46,3 @@ return targets;
 function getNodeJsonTarget(params) {
+    var _a, _b, _c;
     if (params.node.FuncCall !== undefined) {
@@ -58,3 +58,3 @@ return getFunCallJsonTarget({
             columnRef: params.node.ColumnRef,
-            name: params.name,
+            name: (_a = params.name) !== null && _a !== void 0 ? _a : concatStringNodes(params.node.ColumnRef.fields),
             resolvedStatement: params.resolvedStatement,
@@ -65,3 +65,3 @@ });
         return getArrayExprJsonTarget({
-            name: params.name,
+            name: (_b = params.name) !== null && _b !== void 0 ? _b : "array",
             arrayExpr: params.node.A_ArrayExpr,
@@ -71,3 +71,3 @@ resolvedStatement: params.resolvedStatement,
     }
-    if (params.node.TypeCast !== undefined) {
+    if (params.node.TypeCast !== undefined && params.name !== undefined) {
         return getTypeCastJsonTarget({
@@ -82,4 +82,22 @@ name: params.name,
     }
-    return { kind: "unknown" };
+    if (params.node.CoalesceExpr !== undefined) {
+        return getCoalesceJsonTarget({
+            name: (_c = params.name) !== null && _c !== void 0 ? _c : "coalesce",
+            coalesceExpr: params.node.CoalesceExpr,
+            resolvedStatement: params.resolvedStatement,
+        });
+    }
 }
+function getCoalesceJsonTarget(params) {
+    const { name, coalesceExpr, resolvedStatement } = params;
+    if (coalesceExpr.args === undefined) {
+        return;
+    }
+    const targetType = getNodeJsonTarget({
+        name: name,
+        node: coalesceExpr.args[0],
+        resolvedStatement: resolvedStatement,
+    });
+    return targetType;
+}
 function getArrayExprJsonTarget(params) {
@@ -86,0 +104,0 @@ if (!(0, shared_1.isNonEmpty)(params.arrayExpr.elements)) {

lib/src/utils/get-json-target-types.test.js

@@ -260,3 +260,2 @@ "use strict";
       SELECT
-        agency.id,
         jsonb_agg(c) as jsonb_tbl,
@@ -326,3 +325,3 @@ jsonb_agg(c.*) as jsonb_tbl_star,
     const tester = only ? mocha_1.test.only : mocha_1.test;
-    tester(`get resolved statement: ${query}`, async () => {
+    tester(`get json target types: ${query}`, async () => {
         return (0, function_1.pipe)((0, exports.getTargetSourcesTE)(query), fp_ts_1.taskEither.match((error) => assert_1.default.fail(error.message), (result) => assert_1.default.deepEqual(result, expected)))();
@@ -329,0 +328,0 @@ });

lib/src/utils/get-resolved-statement.js

@@ -149,3 +149,3 @@ "use strict";
                     node: columnRef,
-                }
+                },
             ];
@@ -152,0 +152,0 @@ }

package.json

 {
   "name": "@ts-safeql/generate",
-  "version": "3.0.0-next.2",
+  "version": "3.0.0-next.3",
   "description": "",
@@ -25,4 +25,4 @@ "main": "lib/index.js",
   "dependencies": {
-    "@ts-safeql/shared": "3.0.0-next.2",
-    "@ts-safeql/test-utils": "0.0.13-next.2",
+    "@ts-safeql/shared": "3.0.0-next.3",
+    "@ts-safeql/test-utils": "0.0.13-next.3",
     "fp-ts": "^2.13.1",
@@ -29,0 +29,0 @@ "pg-connection-string": "^2.5.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

200652

increased by0.64%

Lines of code

3224

increased by0.53%

Number of medium supply chain risk alerts

0

decreased by-100%

Dependency changes

• + Added@ts-safeql/shared@3.0.0-next.3(transitive)

• + Added@ts-safeql/test-utils@0.0.13-next.3(transitive)

• - Removed@ts-safeql/shared@3.0.0-next.2(transitive)

• - Removed@ts-safeql/test-utils@0.0.13-next.2(transitive)

• Updated@ts-safeql/shared@3.0.0-next.3

• Updated@ts-safeql/test-utils@0.0.13-next.3