pgsql-ast-parser - npm Package Compare versions

Comparing version 2.1.1 to 2.2.0

ast-mapper.d.ts

@@ -34,2 +34,3 @@ import * as a from './syntax/ast';
     createColumn?: (col: a.CreateColumnDef) => a.CreateColumnDef | nil;
+    with?: (val: a.WithStatement) => a.Statement | nil;
     selection?: (val: a.SelectStatement) => a.SelectStatement | nil;
@@ -149,2 +150,3 @@ from?: (from: a.From) => a.From | nil;
     selection(val: a.SelectStatement): a.SelectStatement | nil;
+    with(val: a.WithStatement): a.Statement | nil;
     from(from: a.From): a.From | nil;
@@ -151,0 +153,0 @@ fromStatement(from: a.FromStatement): a.From | nil;

package.json

 {
   "name": "pgsql-ast-parser",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Yet another simple Postgres SQL parser/modifier",
@@ -5,0 +5,0 @@ "main": "index.js",

src/ast-mapper.ts

@@ -37,2 +37,3 @@ import * as a from './syntax/ast';
     createColumn?: (col: a.CreateColumnDef) => a.CreateColumnDef | nil
+    with?: (val: a.WithStatement) => a.Statement | nil
     selection?: (val: a.SelectStatement) => a.SelectStatement | nil
@@ -154,2 +155,14 @@ from?: (from: a.From) => a.From | nil
 
+function withAccepts(val: a.Statement | nil): val is a.WithStatementBinding {
+    switch (val?.type) {
+        case 'select':
+        case 'delete':
+        case 'insert':
+        case 'update':
+            return true;
+        default:
+            return false;
+    }
+}
+
 /**
@@ -188,2 +201,4 @@ * Can be used to modify an AST.
                 return this.insert(val);
+            case 'with':
+                return this.with(val);
             case 'select':
@@ -624,3 +639,3 @@ return this.selection(val);
     // =========================================
-    // ============== EXPRESSIONS ==============
+    // ============== SELECTIONS ==============
     // =========================================
@@ -656,3 +671,25 @@
 
+    with(val: a.WithStatement): a.Statement | nil {
+        const bind = arrayNilMap(val.bind, s => {
+            const statement = this.statement(s.statement);
+            return withAccepts(statement)
+                ? assignChanged(s, { statement })
+                : null;
+        });
 
+        // no bindngs
+        if (!bind) {
+            return this.statement(val.in);
+        }
+        const _in = this.statement(val.in);
+        if (!withAccepts(_in)) {
+            return null;
+        }
+        return assignChanged(val, {
+            bind,
+            in: _in,
+        })
+    }
+
+
     from(from: a.From): a.From | nil {
@@ -659,0 +696,0 @@ switch (from.type) {

src/syntax/ast.ts

@@ -15,2 +15,3 @@ // import { IType } from '../../interfaces';
     | DeleteStatement
+    | WithStatement
     | RollbackStatement
@@ -336,2 +337,11 @@ | TablespaceStatement
 
+export type WithStatementBinding = SelectStatement | InsertStatement | UpdateStatement | DeleteStatement;
+export interface WithStatement {
+    type: 'with';
+    bind: {
+        alias: string;
+        statement: WithStatementBinding;
+    }[];
+    in: WithStatementBinding;
+}
 
@@ -338,0 +348,0 @@ export interface SelectStatement {

src/to-sql.ts

@@ -493,2 +493,13 @@ import { IAstPartialMapper, AstDefaultMapper } from './ast-mapper';
 
+    with: w => {
+        ret.push('WITH ');
+        list(w.bind, b => {
+            ret.push(name(b.alias), ' AS (');
+            m.statement(b.statement);
+            ret.push(') ');
+        }, false);
+
+        m.statement(w.in);
+    },
+
     setGlobal: g => {
@@ -495,0 +506,0 @@ ret.push('SET ', name(g.variable), ' = ');

syntax/ast.d.ts

 import { nil } from '../utils';
 export declare const LOCATION: unique symbol;
-export declare type Statement = (SelectStatement | CreateTableStatement | CreateSequenceStatement | CreateIndexStatement | CreateExtensionStatement | CommitStatement | InsertStatement | UpdateStatement | DeleteStatement | RollbackStatement | TablespaceStatement | AlterTableStatement | AlterSequenceStatement | SetGlobalStatement | SetTimezone | CreateEnumType | TruncateTableStatement | DropTableStatement | DropSequenceStatement | DropIndexStatement | StartTransactionStatement) & {
+export declare type Statement = (SelectStatement | CreateTableStatement | CreateSequenceStatement | CreateIndexStatement | CreateExtensionStatement | CommitStatement | InsertStatement | UpdateStatement | DeleteStatement | WithStatement | RollbackStatement | TablespaceStatement | AlterTableStatement | AlterSequenceStatement | SetGlobalStatement | SetTimezone | CreateEnumType | TruncateTableStatement | DropTableStatement | DropSequenceStatement | DropIndexStatement | StartTransactionStatement) & {
     [LOCATION]?: StatementLocation;
@@ -239,2 +239,11 @@ };
 }
+export declare type WithStatementBinding = SelectStatement | InsertStatement | UpdateStatement | DeleteStatement;
+export interface WithStatement {
+    type: 'with';
+    bind: {
+        alias: string;
+        statement: WithStatementBinding;
+    }[];
+    in: WithStatementBinding;
+}
 export interface SelectStatement {
@@ -241,0 +250,0 @@ type: 'select';

No alert changes

Improved metrics

Total package byte prevSize

951160

increased by1.46%

Number of package files

128

increased by3.23%

Lines of code

10386

increased by1.75%

No dependency changes