Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support all Azure Functions Triggers from the official lib, and fix azure function name #134

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Support all Azure Functions Triggers from the official lib, and fix azure function name #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06faae1
feat(azure-functions): add the rest triggers functions from the libs
mildronize May 5, 2024
0d58f6e
fix(azure-functions): build
mildronize May 5, 2024
472478a
misc: update monorepo version
mildronize May 5, 2024
abc5620
fix(azure-functions): function name to be camelCase
mildronize May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/azure-functions-minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"nammatham": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"@azure/functions": "^4.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/azure-functions-timer-trigger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"nammatham": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"@azure/functions": "^4.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/azure-functions-with-context/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@azure/functions": "^4.4.0",
"@di-extra/inversify": "^0.2.0",
"nammatham": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"inversify": "^6.0.2",
"reflect-metadata": "^0.2.1"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/azure-functions-with-inversify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"dependencies": {
"@azure/functions": "^4.4.0",
"@di-extra/inversify": "^0.2.0",
"@nammatham/inversify": "2.0.0-alpha.13",
"@nammatham/inversify": "workspace:*",
"inversify": "^6.0.2",
"nammatham": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"reflect-metadata": "^0.2.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/azure-functions-with-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "MIT",
"dependencies": {
"@azure/functions": "^4.4.0",
"nammatham": "2.0.0-alpha.13"
"nammatham": "workspace:*"
},
"devDependencies": {
"cross-env": "^7.0.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/azure-functions-with-trpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"license": "MIT",
"dependencies": {
"@azure/functions": "^4.4.0",
"nammatham": "2.0.0-alpha.13",
"@nammatham/trpc-azure-functions": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"@nammatham/trpc-azure-functions": "workspace:*",
"@trpc/client": "^10.45.0",
"@trpc/server": "^10.45.0",
"trpc-azure-functions-adapter": "0.0.5"
Expand Down
2 changes: 1 addition & 1 deletion examples/azure-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"nammatham": "2.0.0-alpha.13",
"nammatham": "workspace:*",
"@azure/functions": "^4.1.0"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion packages/azure-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
"license": "MIT",
"dependencies": {
"@azure/functions": "^4.4.0",
"@nammatham/core": "2.0.0-alpha.13",
"@nammatham/core": "workspace:*",
"colorette": "^2.0.20",
"express": "^4.18.2",
"lodash.camelcase": "^4.3.0",
"undici": "5.20.0",
"uuid": "^9.0.1"
},
Expand All @@ -36,7 +37,9 @@
},
"devDependencies": {
"@types/express": "^4.17.21",
"@types/lodash.camelcase": "^4.3.9",
"@types/uuid": "^9.0.7",
"import": "^0.0.6",
"node-mocks-http": "^1.14.1"
}
}
4 changes: 3 additions & 1 deletion packages/azure-functions/src/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import type { HandlerFunction, RegisterFunctionOption, AzureFunctionsEndpoint, F

import { NammathamContext } from './nammatham-context';

import camelCase from 'lodash.camelcase';

export class AzureFunctionsHandler<
TTriggerType,
TReturnType,
Expand Down Expand Up @@ -37,7 +39,7 @@ export class AzureFunctionsHandler<
return {
...this.functionOption,
type: 'azure-functions',
name: this.funcName,
name: camelCase(this.funcName),
invokeHandler,
registerFunc: this.registerFunc,
};
Expand Down
1 change: 1 addition & 0 deletions packages/azure-functions/src/http/http-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type express from 'express';
import type { HeadersInit } from 'undici';
import type { IncomingHttpHeaders } from 'node:http';

export function convertExpressReqHeaderToHeadersInit(_headers: IncomingHttpHeaders): HeadersInit {
Expand Down
112 changes: 112 additions & 0 deletions packages/azure-functions/src/trigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
TimerFunctionOptions,
HttpMethodFunctionOptions,
StorageQueueFunctionOptions,
StorageBlobFunctionOptions,
ServiceBusQueueFunctionOptions,
ServiceBusTopicFunctionOptions,
EventHubFunctionOptions,
EventGridFunctionOptions,
CosmosDBFunctionOptions,
WarmupFunctionOptions,
SqlFunctionOptions,
} from '@azure/functions';

import { app } from '@azure/functions';
Expand Down Expand Up @@ -106,6 +114,110 @@
);
}

storageBlob(funcName: string, option: Omit<StorageBlobFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.storageBlob(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 128 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L118-L128 

Added lines #L118 - L128 were not covered by tests

serviceBusQueue(funcName: string, option: Omit<ServiceBusQueueFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.serviceBusQueue(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 141 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L131-L141 

Added lines #L131 - L141 were not covered by tests

serviceBusTopic(funcName: string, option: Omit<ServiceBusTopicFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.serviceBusTopic(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 154 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L144-L154 

Added lines #L144 - L154 were not covered by tests

eventHub(funcName: string, option: Omit<EventHubFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.eventHub(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 167 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L157-L167 

Added lines #L157 - L167 were not covered by tests

eventGrid(funcName: string, option: Omit<EventGridFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.eventGrid(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 180 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L170-L180 

Added lines #L170 - L180 were not covered by tests

cosmosDB(funcName: string, option: Omit<CosmosDBFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.cosmosDB(funcName, {
...option,
...funcOption,
} as unknown as CosmosDBFunctionOptions);
}
);
}

Check warning on line 193 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L183-L193 

Added lines #L183 - L193 were not covered by tests

warmup(funcName: string, option: Omit<WarmupFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.warmup(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 206 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L196-L206 

Added lines #L196 - L206 were not covered by tests

sql(funcName: string, option: Omit<SqlFunctionOptions, 'handler'>) {
return new AzureFunctionsHandler<unknown, unknown | void>(
funcName,
this.parseFunctionOption(funcName, option),
funcOption => {
app.sql(funcName, {
...option,
...funcOption,
});
}
);
}

Check warning on line 219 in packages/azure-functions/src/trigger.ts

View check run for this annotation

Codecov / codecov/patch

packages/azure-functions/src/trigger.ts#L209-L219 

Added lines #L209 - L219 were not covered by tests

private parseFunctionOption(
funcName: string,
opt?: Partial<WithEndpointOption & FunctionOption>
Expand Down
2 changes: 1 addition & 1 deletion packages/express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"@nammatham/core": "2.0.0-alpha.13",
"@nammatham/core": "workspace:*",
"@types/express": "^4.17.21",
"colorette": "^2.0.20",
"express": "^4.18.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/inversify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"@nammatham/core": "2.0.0-alpha.13",
"@nammatham/core": "workspace:*",
"inversify": "^6.0.2"
},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/main/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"author": "Thada Wangthammang",
"license": "MIT",
"dependencies": {
"@nammatham/core": "2.0.0-alpha.13",
"@nammatham/azure-functions": "2.0.0-alpha.13",
"@nammatham/express": "2.0.0-alpha.13"
"@nammatham/core": "workspace:*",
"@nammatham/azure-functions": "workspace:*",
"@nammatham/express": "workspace:*"
},
"repository": {
"type": "git",
Expand Down
6 changes: 3 additions & 3 deletions packages/trpc-azure-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"license": "MIT",
"dependencies": {
"@azure/functions": "^4.4.0",
"@nammatham/core": "2.0.0-alpha.13",
"@nammatham/azure-functions": "2.0.0-alpha.13",
"@nammatham/express": "2.0.0-alpha.13",
"@nammatham/core": "workspace:*",
"@nammatham/azure-functions": "workspace:*",
"@nammatham/express": "workspace:*",
"@trpc/server": "^10.45.0",
"express": "^4.18.2",
"trpc-azure-functions-adapter": "0.0.5",
Expand Down
Loading
Loading