Skip to content

Commit

Permalink
Merge pull request #334 from Canner/develop
Browse files Browse the repository at this point in the history 
Chore: bump to 0.10.4
  • Loading branch information
@onlyjackfrost
onlyjackfrost authored Jan 18, 2024
2 parents cadf2b4 + 4e0f6ec commit f7c3786
Show file tree
Hide file tree
Showing 23 changed files with 147 additions and 137 deletions.
4 changes: 2 additions & 2 deletions packages/build/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/build",
"description": "VulcanSQL package for building projects",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand All @@ -22,6 +22,6 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@vulcan-sql/core": "~0.10.3-0"
"@vulcan-sql/core": "~0.10.4-0"
}
}
2 changes: 1 addition & 1 deletion packages/catalog-server/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/catalog-server",
"description": "Catalog server for VulcanSQL",
"version": "0.10.3",
"version": "0.10.4",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/cli",
"description": "CLI tools for VulcanSQL",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"bin": {
"vulcan": "./src/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/core",
"description": "Core package of VulcanSQL",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-api-caller/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/extension-api-caller",
"description": "Calling APIs to get data from other sources",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand All @@ -23,6 +23,6 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@vulcan-sql/core": "^0.10.3"
"@vulcan-sql/core": "^0.10.4"
}
}
197 changes: 102 additions & 95 deletions packages/extension-api-caller/test/restApiCaller.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { getTestCompiler } from '@vulcan-sql/test-utility';
import * as path from 'path';


describe('Test "rest_api" filter', () => {
it(
'Should throw error when not pass the "url" argument',
Expand All @@ -16,9 +15,7 @@ describe('Test "rest_api" filter', () => {
await compileAndLoad(sql);

// Assert
await expect(execute({})).rejects.toThrow(
'url is required'
);
await expect(execute({})).rejects.toThrow('url is required');
},
50 * 1000
);
Expand All @@ -36,19 +33,20 @@ describe('Test "rest_api" filter', () => {
stock: 94,
brand: 'Apple',
category: 'smartphones',
thumbnail: 'https://i.dummyjson.com/data/products/1/thumbnail.jpg',
thumbnail: 'https://cdn.dummyjson.com/product-images/1/thumbnail.jpg',
images: [
'https://i.dummyjson.com/data/products/1/1.jpg',
'https://i.dummyjson.com/data/products/1/2.jpg',
'https://i.dummyjson.com/data/products/1/3.jpg',
'https://i.dummyjson.com/data/products/1/4.jpg',
'https://i.dummyjson.com/data/products/1/thumbnail.jpg'
]
'https://cdn.dummyjson.com/product-images/1/1.jpg',
'https://cdn.dummyjson.com/product-images/1/2.jpg',
'https://cdn.dummyjson.com/product-images/1/3.jpg',
'https://cdn.dummyjson.com/product-images/1/4.jpg',
'https://cdn.dummyjson.com/product-images/1/thumbnail.jpg',
],
});

const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } = await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});
const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } =
await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});

const sql = `{% set value = { "path": { "id": 1 } } %}SELECT {{ value | rest_api(url='https://dummyjson.com/products/:id') }}`;

Expand All @@ -64,96 +62,104 @@ describe('Test "rest_api" filter', () => {
expect(bindings[0].get('$1')).toEqual(expected);
},
50 * 1000
)
);

it(
'Should work with template engine and issue a GET request using the query parameter in value',
async () => {
const expected = JSON.stringify({
"products": [
products: [
{
"id": 1,
"title": "iPhone 9",
"description": "An apple mobile which is nothing like apple",
"price": 549,
"discountPercentage": 12.96,
"rating": 4.69,
"stock": 94,
"brand": "Apple",
"category": "smartphones",
"thumbnail": "https://i.dummyjson.com/data/products/1/thumbnail.jpg",
"images": [
"https://i.dummyjson.com/data/products/1/1.jpg",
"https://i.dummyjson.com/data/products/1/2.jpg",
"https://i.dummyjson.com/data/products/1/3.jpg",
"https://i.dummyjson.com/data/products/1/4.jpg",
"https://i.dummyjson.com/data/products/1/thumbnail.jpg"
]
id: 1,
title: 'iPhone 9',
description: 'An apple mobile which is nothing like apple',
price: 549,
discountPercentage: 12.96,
rating: 4.69,
stock: 94,
brand: 'Apple',
category: 'smartphones',
thumbnail:
'https://cdn.dummyjson.com/product-images/1/thumbnail.jpg',
images: [
'https://cdn.dummyjson.com/product-images/1/1.jpg',
'https://cdn.dummyjson.com/product-images/1/2.jpg',
'https://cdn.dummyjson.com/product-images/1/3.jpg',
'https://cdn.dummyjson.com/product-images/1/4.jpg',
'https://cdn.dummyjson.com/product-images/1/thumbnail.jpg',
],
},
{
"id": 2,
"title": "iPhone X",
"description": "SIM-Free, Model A19211 6.5-inch Super Retina HD display with OLED technology A12 Bionic chip with ...",
"price": 899,
"discountPercentage": 17.94,
"rating": 4.44,
"stock": 34,
"brand": "Apple",
"category": "smartphones",
"thumbnail": "https://i.dummyjson.com/data/products/2/thumbnail.jpg",
"images": [
"https://i.dummyjson.com/data/products/2/1.jpg",
"https://i.dummyjson.com/data/products/2/2.jpg",
"https://i.dummyjson.com/data/products/2/3.jpg",
"https://i.dummyjson.com/data/products/2/thumbnail.jpg"
]
id: 2,
title: 'iPhone X',
description:
'SIM-Free, Model A19211 6.5-inch Super Retina HD display with OLED technology A12 Bionic chip with ...',
price: 899,
discountPercentage: 17.94,
rating: 4.44,
stock: 34,
brand: 'Apple',
category: 'smartphones',
thumbnail:
'https://cdn.dummyjson.com/product-images/2/thumbnail.jpg',
images: [
'https://cdn.dummyjson.com/product-images/2/1.jpg',
'https://cdn.dummyjson.com/product-images/2/2.jpg',
'https://cdn.dummyjson.com/product-images/2/3.jpg',
'https://cdn.dummyjson.com/product-images/2/thumbnail.jpg',
],
},
{
"id": 71,
"title": "Women Shoulder Bags",
"description": "LouisWill Women Shoulder Bags Long Clutches Cross Body Bags Phone Bags PU Leather Hand Bags Large Capacity Card Holders Zipper Coin Purses Fashion Crossbody Bags for Girls Ladies",
"price": 46,
"discountPercentage": 14.65,
"rating": 4.71,
"stock": 17,
"brand": "LouisWill",
"category": "womens-bags",
"thumbnail": "https://i.dummyjson.com/data/products/71/thumbnail.jpg",
"images": [
"https://i.dummyjson.com/data/products/71/1.jpg",
"https://i.dummyjson.com/data/products/71/2.jpg",
"https://i.dummyjson.com/data/products/71/3.webp",
"https://i.dummyjson.com/data/products/71/thumbnail.jpg"
]
id: 71,
title: 'Women Shoulder Bags',
description:
'LouisWill Women Shoulder Bags Long Clutches Cross Body Bags Phone Bags PU Leather Hand Bags Large Capacity Card Holders Zipper Coin Purses Fashion Crossbody Bags for Girls Ladies',
price: 46,
discountPercentage: 14.65,
rating: 4.71,
stock: 17,
brand: 'LouisWill',
category: 'womens-bags',
thumbnail:
'https://cdn.dummyjson.com/product-images/71/thumbnail.jpg',
images: [
'https://cdn.dummyjson.com/product-images/71/1.jpg',
'https://cdn.dummyjson.com/product-images/71/2.jpg',
'https://cdn.dummyjson.com/product-images/71/3.webp',
'https://cdn.dummyjson.com/product-images/71/thumbnail.jpg',
],
},
{
"id": 86,
"title": "Bluetooth Aux",
"description": "Bluetooth Aux Bluetooth Car Aux Car Bluetooth Transmitter Aux Audio Receiver Handfree Car Bluetooth Music Receiver Universal 3.5mm Streaming A2DP Wireless Auto AUX Audio Adapter With Mic For Phone MP3",
"price": 25,
"discountPercentage": 10.56,
"rating": 4.57,
"stock": 22,
"brand": "Car Aux",
"category": "automotive",
"thumbnail": "https://i.dummyjson.com/data/products/86/thumbnail.jpg",
"images": [
"https://i.dummyjson.com/data/products/86/1.jpg",
"https://i.dummyjson.com/data/products/86/2.webp",
"https://i.dummyjson.com/data/products/86/3.jpg",
"https://i.dummyjson.com/data/products/86/4.jpg",
"https://i.dummyjson.com/data/products/86/thumbnail.jpg"
]
}
id: 86,
title: 'Bluetooth Aux',
description:
'Bluetooth Aux Bluetooth Car Aux Car Bluetooth Transmitter Aux Audio Receiver Handfree Car Bluetooth Music Receiver Universal 3.5mm Streaming A2DP Wireless Auto AUX Audio Adapter With Mic For Phone MP3',
price: 25,
discountPercentage: 10.56,
rating: 4.57,
stock: 22,
brand: 'Car Aux',
category: 'automotive',
thumbnail:
'https://cdn.dummyjson.com/product-images/86/thumbnail.jpg',
images: [
'https://cdn.dummyjson.com/product-images/86/1.jpg',
'https://cdn.dummyjson.com/product-images/86/2.webp',
'https://cdn.dummyjson.com/product-images/86/3.jpg',
'https://cdn.dummyjson.com/product-images/86/4.jpg',
'https://cdn.dummyjson.com/product-images/86/thumbnail.jpg',
],
},
],
"total": 4,
"skip": 0,
"limit": 4
total: 4,
skip: 0,
limit: 4,
});

const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } = await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});
const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } =
await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});

const sql = `{% set value = { "query": { "q": "phone" } } %}SELECT {{ value | rest_api(url='https://dummyjson.com/products/search') }}`;

Expand All @@ -169,19 +175,20 @@ describe('Test "rest_api" filter', () => {
expect(bindings[0].get('$1')).toEqual(expected);
},
50 * 1000
)
);

it(
'Should work with template engine and issue a POST request with body and header in value',
async () => {
const expected = JSON.stringify({
id: 101,
title: 'BMW Pencil'
title: 'BMW Pencil',
});

const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } = await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});
const { compileAndLoad, execute, getExecutedQueries, getCreatedBinding } =
await getTestCompiler({
extensions: { rest_api: path.join(__dirname, '..', 'src') },
});

const sql = `{% set value = { "body": { "title": "BMW Pencil" }, "headers": { "Content-Type": "application/json" } } %}SELECT {{ value | rest_api(url='https://dummyjson.com/products/add', method='POST') }}`;

Expand All @@ -197,5 +204,5 @@ describe('Test "rest_api" filter', () => {
expect(bindings[0].get('$1')).toEqual(expected);
},
50 * 1000
)
);
});
6 changes: 3 additions & 3 deletions packages/extension-authenticator-canner/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/extension-authenticator-canner",
"description": "Canner Enterprise authenticator for Vulcan SQL",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand All @@ -24,7 +24,7 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@vulcan-sql/core": "~0.10.3-0",
"@vulcan-sql/serve": "~0.10.3-0"
"@vulcan-sql/core": "~0.10.4-0",
"@vulcan-sql/serve": "~0.10.4-0"
}
}
4 changes: 2 additions & 2 deletions packages/extension-dbt/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/extension-dbt",
"description": "Using dbt models form VulcanSQL projects",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand All @@ -23,6 +23,6 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@vulcan-sql/core": "~0.10.3-0"
"@vulcan-sql/core": "~0.10.4-0"
}
}
6 changes: 3 additions & 3 deletions packages/extension-debug-tools/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vulcan-sql/extension-debug-tools",
"description": "A collection of Vulcan extension debug tools",
"version": "0.10.3",
"version": "0.10.4",
"type": "commonjs",
"publishConfig": {
"access": "public"
Expand All @@ -22,9 +22,9 @@
},
"license": "Apache-2.0",
"peerDependencies": {
"@vulcan-sql/core": "~0.10.3-0"
"@vulcan-sql/core": "~0.10.4-0"
},
"devDependencies": {
"@vulcan-sql/test-utility": "~0.10.3-0"
"@vulcan-sql/test-utility": "~0.10.4-0"
}
}
Loading

1 comment on commit f7c3786

@vercel
Copy link

@vercel vercel bot commented on f7c3786 Jan 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

vulcan-sql-document – ./

vulcan-sql-document-vulcan-sql-document.vercel.app
vulcansql.com
vulcan-sql-document-git-main-vulcan-sql-document.vercel.app
vulcan-sql-document.vercel.app
www.vulcansql.com

Please sign in to comment.