@balena/abstract-sql-compiler - npm Package Compare versions

Comparing version 7.2.1-improve-typings-74e3699cdde33d55127b8219b7c269f7da9426d4 to 7.2.1-improve-typings-947056d2d6b65660c8b21d910e47a8a40715aa38

CHANGELOG.md

@@ -9,3 +9,3 @@ # Change Log
 
-* Improve typing for UpsertQuery compilation result [Pagan Gazzard]
+* Improve typings for compilation results [Pagan Gazzard]
 
@@ -12,0 +12,0 @@ ## 7.2.0 - 2020-12-16

out/AbstractSQLCompiler.d.ts

@@ -81,2 +81,6 @@ export declare const enum Engines {
 ];
+export declare type InsertQueryNode = ['InsertQuery', ...AbstractSqlType[]];
+export declare type UpdateQueryNode = ['UpdateQuery', ...AbstractSqlType[]];
+export declare type DeleteQueryNode = ['DeleteQuery', ...AbstractSqlType[]];
+export declare type UpsertQueryNode = ['UpsertQuery', InsertQueryNode, UpdateQueryNode];
 export interface FromTypeNode {
@@ -115,3 +119,3 @@ SelectQueryNode: SelectQueryNode;
 export declare type AliasNode<T> = ['Alias', T, string];
-export declare type AbstractSqlType = string | NullNode | DateNode | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | SelectNode | ValuesNode | UnknownNode;
+export declare type AbstractSqlType = string | NullNode | DateNode | BooleanTypeNodes | NumberTypeNodes | TextTypeNodes | UnknownTypeNodes | DurationNode | SelectQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode | UpsertQueryNode | SelectNode | ValuesNode | InnerJoinNode | LeftJoinNode | RightJoinNode | FullJoinNode | CrossJoinNode | GroupByNode | UnknownNode;
 export declare type UnknownNode = AbstractSqlQuery;
@@ -118,0 +122,0 @@ export interface AbstractSqlQuery extends Array<AbstractSqlType> {

out/AbstractSQLRules2SQL.d.ts

@@ -1,2 +0,2 @@
-import { AbstractSqlQuery, AbstractSqlType, Engines } from './AbstractSQLCompiler';
+import { AbstractSqlQuery, AbstractSqlType, Engines, InsertQueryNode, SelectQueryNode, UnionQueryNode, UpdateQueryNode, DeleteQueryNode, UpsertQueryNode } from './AbstractSQLCompiler';
 export declare type Binding = [string, any] | ['Bind', number | string | [string, string]];
@@ -28,3 +28,5 @@ export interface SqlResult {
 export declare function AbstractSQLRules2SQL(abstractSQL: AbstractSqlQuery, $engine: Engines, $noBinds: true): string;
+export declare function AbstractSQLRules2SQL(abstractSQL: UpsertQueryNode, $engine: Engines, $noBinds?: false): [SqlResult, SqlResult];
+export declare function AbstractSQLRules2SQL(abstractSQL: SelectQueryNode | UnionQueryNode | InsertQueryNode | UpdateQueryNode | DeleteQueryNode, $engine: Engines, $noBinds?: false): SqlResult;
 export declare function AbstractSQLRules2SQL(abstractSQL: AbstractSqlQuery, $engine: Engines, $noBinds?: false): SqlResult | [SqlResult, SqlResult];
 export declare function AbstractSQLRules2SQL(abstractSQL: AbstractSqlQuery, $engine: Engines, $noBinds?: boolean): SqlResult | [SqlResult, SqlResult] | string;

package.json

 {
   "name": "@balena/abstract-sql-compiler",
-  "version": "7.2.1-improve-typings-74e3699cdde33d55127b8219b7c269f7da9426d4",
+  "version": "7.2.1-improve-typings-947056d2d6b65660c8b21d910e47a8a40715aa38",
   "description": "A translator for abstract sql into sql.",
@@ -5,0 +5,0 @@ "main": "out/AbstractSQLCompiler.js",

src/AbstractSQLCompiler.ts

@@ -137,2 +137,6 @@ export const enum Engines {
 ];
+export type InsertQueryNode = ['InsertQuery', ...AbstractSqlType[]];
+export type UpdateQueryNode = ['UpdateQuery', ...AbstractSqlType[]];
+export type DeleteQueryNode = ['DeleteQuery', ...AbstractSqlType[]];
+export type UpsertQueryNode = ['UpsertQuery', InsertQueryNode, UpdateQueryNode];
 
@@ -201,4 +205,14 @@ /**
 	| SelectQueryNode
+	| InsertQueryNode
+	| UpdateQueryNode
+	| DeleteQueryNode
+	| UpsertQueryNode
 	| SelectNode
 	| ValuesNode
+	| InnerJoinNode
+	| LeftJoinNode
+	| RightJoinNode
+	| FullJoinNode
+	| CrossJoinNode
+	| GroupByNode
 	| UnknownNode;
@@ -205,0 +219,0 @@ export type UnknownNode = AbstractSqlQuery;

src/AbstractSQLRules2SQL.ts

@@ -10,2 +10,8 @@ import * as _ from 'lodash';
 	Engines,
+	InsertQueryNode,
+	SelectQueryNode,
+	UnionQueryNode,
+	UpdateQueryNode,
+	DeleteQueryNode,
+	UpsertQueryNode,
 } from './AbstractSQLCompiler';
@@ -1269,2 +1275,17 @@
 export function AbstractSQLRules2SQL(
+	abstractSQL: UpsertQueryNode,
+	$engine: Engines,
+	$noBinds?: false,
+): [SqlResult, SqlResult];
+export function AbstractSQLRules2SQL(
+	abstractSQL:
+		| SelectQueryNode
+		| UnionQueryNode
+		| InsertQueryNode
+		| UpdateQueryNode
+		| DeleteQueryNode,
+	$engine: Engines,
+	$noBinds?: false,
+): SqlResult;
+export function AbstractSQLRules2SQL(
 	abstractSQL: AbstractSqlQuery,
@@ -1271,0 +1292,0 @@ $engine: Engines,

No alert changes

Improved metrics

Total package byte prevSize

551651

increased by0.33%

Lines of code

12070

increased by0.35%

No dependency changes