@netlify/functions
Advanced tools
Comparing version 1.2.0 to 1.3.0
@@ -1,4 +0,4 @@ | ||
import type { Context } from './context'; | ||
import type { Event } from './event'; | ||
import type { Response, BuilderResponse } from './response'; | ||
import type { Context } from './context.js'; | ||
import type { Event } from './event.js'; | ||
import type { Response, BuilderResponse } from './response.js'; | ||
export interface HandlerCallback<ResponseType extends Response = Response> { | ||
@@ -10,3 +10,6 @@ (error: any, response: ResponseType): void; | ||
} | ||
export interface BackgroundHandler<C extends Context = Context> { | ||
(event: Event, context: C): void | Promise<void>; | ||
} | ||
export declare type Handler = BaseHandler<Response, Context>; | ||
export declare type BuilderHandler = BaseHandler<BuilderResponse, Context>; |
@@ -1,6 +0,6 @@ | ||
export { Context as HandlerContext } from './context'; | ||
export { Event as HandlerEvent } from './event'; | ||
export { Handler, HandlerCallback } from './handler'; | ||
export { Response as HandlerResponse } from './response'; | ||
export { getSecrets, getSecretsForBuild, withSecrets, getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders, } from '../lib/graph'; | ||
export { NetlifySecrets } from '../lib/secrets_helper'; | ||
export { Context as HandlerContext } from './context.js'; | ||
export { Event as HandlerEvent } from './event.js'; | ||
export { Handler, BackgroundHandler, HandlerCallback } from './handler.js'; | ||
export { Response as HandlerResponse } from './response.js'; | ||
export { getSecrets, getSecretsForBuild, withSecrets, getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders, } from '../lib/graph.js'; | ||
export { NetlifySecrets } from '../lib/secrets_helper.js'; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.getNetlifyGraphTokenForBuild = exports.getNetlifyGraphToken = exports.withSecrets = exports.getSecretsForBuild = exports.getSecrets = void 0; | ||
var graph_1 = require("../lib/graph"); | ||
Object.defineProperty(exports, "getSecrets", { enumerable: true, get: function () { return graph_1.getSecrets; } }); | ||
Object.defineProperty(exports, "getSecretsForBuild", { enumerable: true, get: function () { return graph_1.getSecretsForBuild; } }); | ||
Object.defineProperty(exports, "withSecrets", { enumerable: true, get: function () { return graph_1.withSecrets; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphToken", { enumerable: true, get: function () { return graph_1.getNetlifyGraphToken; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphTokenForBuild", { enumerable: true, get: function () { return graph_1.getNetlifyGraphTokenForBuild; } }); | ||
var graph_js_1 = require("../lib/graph.js"); | ||
Object.defineProperty(exports, "getSecrets", { enumerable: true, get: function () { return graph_js_1.getSecrets; } }); | ||
Object.defineProperty(exports, "getSecretsForBuild", { enumerable: true, get: function () { return graph_js_1.getSecretsForBuild; } }); | ||
Object.defineProperty(exports, "withSecrets", { enumerable: true, get: function () { return graph_js_1.withSecrets; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphToken", { enumerable: true, get: function () { return graph_js_1.getNetlifyGraphToken; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphTokenForBuild", { enumerable: true, get: function () { return graph_js_1.getNetlifyGraphTokenForBuild; } }); |
@@ -1,3 +0,3 @@ | ||
import { BuilderHandler, Handler } from '../function/handler'; | ||
import { BuilderHandler, Handler } from '../function/handler.js'; | ||
declare const wrapHandler: (handler: BuilderHandler) => Handler; | ||
export { wrapHandler as builder }; |
@@ -19,9 +19,8 @@ "use strict"; | ||
var is_promise_1 = __importDefault(require("is-promise")); | ||
var consts_1 = require("./consts"); | ||
var consts_js_1 = require("./consts.js"); | ||
var augmentResponse = function (response) { | ||
var _a; | ||
if (!response) { | ||
return response; | ||
} | ||
var metadata = { version: consts_1.METADATA_VERSION, builder_function: consts_1.BUILDER_FUNCTIONS_FLAG, ttl: (_a = response.ttl) !== null && _a !== void 0 ? _a : 0 }; | ||
var metadata = { version: consts_js_1.METADATA_VERSION, builder_function: consts_js_1.BUILDER_FUNCTIONS_FLAG, ttl: response.ttl || 0 }; | ||
return __assign(__assign({}, response), { metadata: metadata }); | ||
@@ -35,3 +34,3 @@ }; | ||
body: 'Method Not Allowed', | ||
statusCode: consts_1.HTTP_STATUS_METHOD_NOT_ALLOWED, | ||
statusCode: consts_js_1.HTTP_STATUS_METHOD_NOT_ALLOWED, | ||
}); | ||
@@ -41,4 +40,6 @@ } | ||
var modifiedEvent = __assign(__assign({}, event), { multiValueQueryStringParameters: {}, queryStringParameters: {} }); | ||
// eslint-disable-next-line promise/prefer-await-to-callbacks | ||
var wrappedCallback = function (error, response) { return callback === null || callback === void 0 ? void 0 : callback(error, augmentResponse(response)); }; | ||
var wrappedCallback = function (error, response) { | ||
// eslint-disable-next-line promise/prefer-await-to-callbacks | ||
return callback ? callback(error, augmentResponse(response)) : null; | ||
}; | ||
var execution = handler(modifiedEvent, context, wrappedCallback); | ||
@@ -45,0 +46,0 @@ if ((0, is_promise_1.default)(execution)) { |
@@ -27,5 +27,4 @@ "use strict"; | ||
// Backwards compatibility with older version of cli that doesn't inject header | ||
var token = event === null || event === void 0 ? void 0 : event.authlifyToken; | ||
if (token) { | ||
return { token: token }; | ||
if (event && event.authlifyToken) { | ||
return { token: event.authlifyToken }; | ||
} | ||
@@ -32,0 +31,0 @@ // If we're in dev-mode with next.js, the plugin won't be there to inject |
@@ -1,8 +0,8 @@ | ||
import { Context as HandlerContext, Context } from '../function/context'; | ||
import { Event as HandlerEvent } from '../function/event'; | ||
import { BaseHandler, HandlerCallback } from '../function/handler'; | ||
import { Response } from '../function/response'; | ||
import { NetlifySecrets } from './secrets_helper'; | ||
export { getSecrets, getSecretsForBuild } from './secrets_helper'; | ||
export { getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders } from './graph_token'; | ||
import { Context as HandlerContext, Context } from '../function/context.js'; | ||
import { Event as HandlerEvent } from '../function/event.js'; | ||
import { BaseHandler, HandlerCallback } from '../function/handler.js'; | ||
import { Response } from '../function/response.js'; | ||
import { NetlifySecrets } from './secrets_helper.js'; | ||
export { getSecrets, getSecretsForBuild } from './secrets_helper.js'; | ||
export { getNetlifyGraphToken, getNetlifyGraphTokenForBuild, GraphTokenResponse, HasHeaders } from './graph_token.js'; | ||
export interface ContextWithSecrets extends Context { | ||
@@ -9,0 +9,0 @@ secrets: NetlifySecrets; |
@@ -51,10 +51,10 @@ "use strict"; | ||
exports.withSecrets = exports.getNetlifyGraphTokenForBuild = exports.getNetlifyGraphToken = exports.getSecretsForBuild = exports.getSecrets = void 0; | ||
var secrets_helper_1 = require("./secrets_helper"); | ||
var secrets_helper_js_1 = require("./secrets_helper.js"); | ||
// Fine-grained control during the preview, less necessary with a more proactive OneGraph solution | ||
var secrets_helper_2 = require("./secrets_helper"); | ||
Object.defineProperty(exports, "getSecrets", { enumerable: true, get: function () { return secrets_helper_2.getSecrets; } }); | ||
Object.defineProperty(exports, "getSecretsForBuild", { enumerable: true, get: function () { return secrets_helper_2.getSecretsForBuild; } }); | ||
var graph_token_1 = require("./graph_token"); | ||
Object.defineProperty(exports, "getNetlifyGraphToken", { enumerable: true, get: function () { return graph_token_1.getNetlifyGraphToken; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphTokenForBuild", { enumerable: true, get: function () { return graph_token_1.getNetlifyGraphTokenForBuild; } }); | ||
var secrets_helper_js_2 = require("./secrets_helper.js"); | ||
Object.defineProperty(exports, "getSecrets", { enumerable: true, get: function () { return secrets_helper_js_2.getSecrets; } }); | ||
Object.defineProperty(exports, "getSecretsForBuild", { enumerable: true, get: function () { return secrets_helper_js_2.getSecretsForBuild; } }); | ||
var graph_token_js_1 = require("./graph_token.js"); | ||
Object.defineProperty(exports, "getNetlifyGraphToken", { enumerable: true, get: function () { return graph_token_js_1.getNetlifyGraphToken; } }); | ||
Object.defineProperty(exports, "getNetlifyGraphTokenForBuild", { enumerable: true, get: function () { return graph_token_js_1.getNetlifyGraphTokenForBuild; } }); | ||
// The common usage of this module | ||
@@ -68,3 +68,3 @@ var withSecrets = function (handler) { | ||
switch (_a.label) { | ||
case 0: return [4 /*yield*/, (0, secrets_helper_1.getSecrets)(event)]; | ||
case 0: return [4 /*yield*/, (0, secrets_helper_js_1.getSecrets)(event)]; | ||
case 1: | ||
@@ -71,0 +71,0 @@ secrets = _a.sent(); |
@@ -1,2 +0,2 @@ | ||
import type { Handler } from '../function'; | ||
import type { Handler } from '../function/index.js'; | ||
/** | ||
@@ -3,0 +3,0 @@ * Declares a function to run on a cron schedule. |
@@ -1,2 +0,2 @@ | ||
import { HasHeaders } from './graph_token'; | ||
import { HasHeaders } from './graph_token.js'; | ||
declare const services: { | ||
@@ -3,0 +3,0 @@ gitHub: null; |
@@ -51,4 +51,4 @@ "use strict"; | ||
exports.getSecretsForBuild = exports.getSecrets = void 0; | ||
var graph_request_1 = require("./graph_request"); | ||
var graph_token_1 = require("./graph_token"); | ||
var graph_request_js_1 = require("./graph_request.js"); | ||
var graph_token_js_1 = require("./graph_token.js"); | ||
var services = { | ||
@@ -71,7 +71,11 @@ gitHub: null, | ||
var formatSecrets = function (result) { | ||
var _a, _b, _c; | ||
var responseServices = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.me) === null || _b === void 0 ? void 0 : _b.serviceMetadata) === null || _c === void 0 ? void 0 : _c.loggedInServices; | ||
if (!responseServices) { | ||
if (!result || | ||
!result.data || | ||
!result.data.me || | ||
!result.data.me.serviceMetadata || | ||
!result.data.me.serviceMetadata.loggedInServices) { | ||
return {}; | ||
} | ||
// TODO use optional chaining once we drop node 12 or lower | ||
var responseServices = result.data.me.serviceMetadata.loggedInServices; | ||
var newSecrets = responseServices.reduce(function (acc, service) { | ||
@@ -118,3 +122,3 @@ var _a; | ||
body = JSON.stringify({ query: findLoggedInServicesQuery }); | ||
return [4 /*yield*/, (0, graph_request_1.graphRequest)(token, new TextEncoder().encode(body))]; | ||
return [4 /*yield*/, (0, graph_request_js_1.graphRequest)(token, new TextEncoder().encode(body))]; | ||
case 1: | ||
@@ -133,3 +137,3 @@ resultBody = _a.sent(); | ||
case 0: | ||
graphTokenResponse = (0, graph_token_1.getNetlifyGraphToken)(event, true); | ||
graphTokenResponse = (0, graph_token_js_1.getNetlifyGraphToken)(event, true); | ||
graphToken = graphTokenResponse.token; | ||
@@ -153,3 +157,3 @@ if (!graphToken) { | ||
case 0: | ||
graphTokenResponse = (0, graph_token_1.getNetlifyGraphTokenForBuild)(); | ||
graphTokenResponse = (0, graph_token_js_1.getNetlifyGraphTokenForBuild)(); | ||
graphToken = graphTokenResponse.token; | ||
@@ -156,0 +160,0 @@ if (!graphToken) { |
@@ -1,3 +0,3 @@ | ||
export { builder } from './lib/builder'; | ||
export { schedule } from './lib/schedule'; | ||
export * from './function'; | ||
export { builder } from './lib/builder.js'; | ||
export { schedule } from './lib/schedule.js'; | ||
export * from './function/index.js'; |
@@ -18,6 +18,6 @@ "use strict"; | ||
exports.schedule = exports.builder = void 0; | ||
var builder_1 = require("./lib/builder"); | ||
Object.defineProperty(exports, "builder", { enumerable: true, get: function () { return builder_1.builder; } }); | ||
var schedule_1 = require("./lib/schedule"); | ||
Object.defineProperty(exports, "schedule", { enumerable: true, get: function () { return schedule_1.schedule; } }); | ||
__exportStar(require("./function"), exports); | ||
var builder_js_1 = require("./lib/builder.js"); | ||
Object.defineProperty(exports, "builder", { enumerable: true, get: function () { return builder_js_1.builder; } }); | ||
var schedule_js_1 = require("./lib/schedule.js"); | ||
Object.defineProperty(exports, "schedule", { enumerable: true, get: function () { return schedule_js_1.schedule; } }); | ||
__exportStar(require("./function/index.js"), exports); |
@@ -5,3 +5,3 @@ { | ||
"types": "./dist/main.d.ts", | ||
"version": "1.2.0", | ||
"version": "1.3.0", | ||
"description": "JavaScript utilities for Netlify Functions", | ||
@@ -18,4 +18,4 @@ "files": [ | ||
"test": "run-s format test:dev", | ||
"format": "run-s format:check-fix:*", | ||
"format:ci": "run-s format:check:*", | ||
"format": "run-s build format:check-fix:*", | ||
"format:ci": "run-s build format:check:*", | ||
"format:check-fix:lint": "run-e format:check:lint format:fix:lint", | ||
@@ -30,6 +30,7 @@ "format:check:lint": "cross-env-shell eslint $npm_package_config_eslint", | ||
"test:dev:ava": "ava", | ||
"test:dev:tsd": "tsd", | ||
"test:ci:ava": "nyc -r lcovonly -r text -r json ava" | ||
}, | ||
"config": { | ||
"eslint": "--ignore-pattern README.md --ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,.github}/**/*.{ts,js,md,html}\" \"*.{ts,js,md,html}\" \".*.{ts,js,md,html}\"", | ||
"eslint": "--ignore-pattern README.md --ignore-path .gitignore --cache --format=codeframe --max-warnings=0 \"{src,scripts,.github,test}/**/*.{ts,js,md,html}\" \"*.{ts,js,md,html}\" \".*.{ts,js,md,html}\"", | ||
"prettier": "--ignore-path .gitignore --loglevel=warn \"{src,scripts,.github}/**/*.{ts,js,md,yml,json,html}\" \"*.{ts,js,yml,json,html}\" \".*.{ts,js,yml,json,html}\" \"!**/package-lock.json\" \"!package-lock.json\"" | ||
@@ -39,6 +40,9 @@ }, | ||
"files": [ | ||
"test/*.js" | ||
"test/unit/*.js" | ||
], | ||
"verbose": true | ||
}, | ||
"tsd": { | ||
"directory": "test/types/" | ||
}, | ||
"keywords": [], | ||
@@ -60,3 +64,3 @@ "license": "MIT", | ||
"@commitlint/config-conventional": "^13.0.0", | ||
"@netlify/eslint-config-node": "^5.1.8", | ||
"@netlify/eslint-config-node": "^7.0.0", | ||
"ava": "^2.4.0", | ||
@@ -66,2 +70,3 @@ "husky": "^7.0.4", | ||
"nyc": "^15.0.0", | ||
"tsd": "^0.24.1", | ||
"typescript": "^4.4.4" | ||
@@ -68,0 +73,0 @@ }, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
37025
691
9