@chainlink/external-adapter-framework 2.2.1 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -68,8 +68,10 @@ class AdapterEndpoint {
68
68
  }
69
69
  }
70
70
  getRequestOverrides(data, overrides) {
71
- const overrideAdapterName = data['adapterNameOverride'];
72
- return overrides?.[overrideAdapterName] || overrides?.[this.adapterName.toLowerCase()];
71
+ const overrideAdapterName = (0, util_1.getCanonicalAdapterName)(data['adapterNameOverride']);
72
+ const adapterName = (0, util_1.getCanonicalAdapterName)(this.adapterName);
73
+ const canonicalOverrides = (0, util_1.canonicalizeAdapterNameKeys)(overrides);
74
+ return canonicalOverrides?.[overrideAdapterName] || canonicalOverrides?.[adapterName];
73
75
  }
74
76
  /**
75
77
  * Default request transform that takes requests and manipulates base params
@@ -129,8 +131,11 @@ class AdapterEndpoint {
129
131
  * @returns the transport param or override if present
130
132
  */
131
133
  defaultRouter(req) {
134
+ // DefaultRouter is called before customInputValidation, so we don't have
135
+ // the validation data on the requestContext yet.
136
+ const data = {};
132
137
  const rawRequestBody = req.body;
133
- const requestOverrides = rawRequestBody.data?.overrides?.[this.adapterName.toLowerCase()];
138
+ const requestOverrides = this.getRequestOverrides(data, rawRequestBody.data?.overrides);
134
139
  // Transport override
135
140
  if (requestOverrides?.['transport']) {
136
141
  return requestOverrides['transport'];
@@ -1 +1 @@
1
- {"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../../src/adapter/endpoint.ts"],"names":[],"mappings":";;;AAAA,gDAAiD;AAEjD,8CAA+C;AAC/C,kCAAmF;AACnF,8CAA+C;AAC/C,+CAAkD;AAalD,MAAM,MAAM,GAAG,IAAA,iBAAU,EAAC,iBAAiB,CAAC,CAAA;AAC/B,QAAA,sBAAsB,GAAG,0BAA0B,CAAA;AAEhE;;GAEG;AACH,MAAa,eAAe;IAkB1B,YAAY,MAAgC;QAC1C,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;QAC7B,uDAAuD;QACvD,IAAI,iBAAiB,IAAI,MAAM,EAAE,CAAC;YAChC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;YAC7C,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;YACvC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,GAAG,IAAI,4BAAe,EAAK,CAAC,QAAQ,CACtD,8BAAsB,EACtB,MAAM,CAAC,SAAS,CACjB,CAAA;QACH,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,4BAAe,CAAC,EAAE,CAAC,CAAA;QACxE,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;QACvC,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;QACjD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAA;QACzD,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,sBAAsB,CAAA;QAC3D,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,CAAA;IACjG,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CACd,WAAmB,EACnB,YAAiC,EACjC,eAA8B;QAE9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,MAAM,aAAa,GAAG,IAAI,wBAAa,CAAC;YACtC,YAAY;YACZ,eAAe,EAAE,eAAkC;YACnD,WAAW;YACX,YAAY,EAAE,IAAI,CAAC,IAAI;YACvB,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAA;QAEF,MAAM,qBAAqB,GAAG;YAC5B,GAAG,YAAY;YACf,aAAa;SACd,CAAA;QAED,MAAM,CAAC,KAAK,CAAC,yCAAyC,IAAI,CAAC,IAAI,MAAM,CAAC,CAAA;QACtE,KAAK,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;YACxE,MAAM,SAAS,CAAC,UAAU,CAAC,qBAAqB,EAAE,eAAe,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;QAC9F,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,oBAAoB,CAClB,GAAwD,EACxD,QAAuB;QAEvB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC/C,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,IAA4B,EAAE,SAAqB;QACrE,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACvD,OAAO,SAAS,EAAE,CAAC,mBAAmB,CAAC,IAAI,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAA;IACxF,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,GAAwD;QACtE,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,IAA8B,CAAA;QAC9D,MAAM,cAAc,GAAG,GAAG,CAAC,IAA4C,CAAA;QACvE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QACvF,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;QACzB,IAAI,gBAAgB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,qDAAqD;YACrD,IAAI,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACvC,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,sCAAsC;YACtC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACrC,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,0BAA0B,CACxB,GAAwD,EACxD,QAAuB;QAEvB,2CAA2C;QAC3C,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,8BAAsB,CAAC,EAAE,CAAC;YACrD,OAAO,8BAAsB,CAAA;QAC/B,CAAC;QAED,4CAA4C;QAC5C,qDAAqD;QACrD,4DAA4D;QAC5D,sEAAsE;QACtE,MAAM,gBAAgB,GACpB,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACvD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAA;QAEvB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,oBAAY,CAAC;gBACrB,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,0JAA0J;aACpK,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAA;QACpD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,oBAAY,CAAC;gBACrB,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,+BAA+B,aAAa,qBAAqB,IAAI,CAAC,SAAS,CACtF,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAClC,EAAE;aACJ,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,wCAAwC,aAAa,GAAG,CAAC,CAAA;QACtE,OAAO,aAAa,CAAA;IACtB,CAAC;IAED;;;;;;OAMG;IACK,aAAa,CAAC,GAAwD;QAC5E,MAAM,cAAc,GAAG,GAAG,CAAC,IAA+C,CAAA;QAC1E,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAA;QACzF,qBAAqB;QACrB,IAAI,gBAAgB,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,OAAO,gBAAgB,CAAC,WAAW,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,cAAc,CAAC,IAAI,EAAE,SAAS,CAAA;IACvC,CAAC;CACF;AA3KD,0CA2KC"}
1
+ {"version":3,"file":"endpoint.js","sourceRoot":"","sources":["../../../src/adapter/endpoint.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,12 @@ const require = createRequire(import.meta.url);
5
5
  const execAsPromise = async (command) => {
6
6
  return new Promise(async (resolve, reject) => {
7
7
  exec(command, (error, stdout, stderr) => {
8
- if (error.code === 0) {
8
+ if (error) {
9
+ reject(error);
10
+ }
11
+ else {
9
12
  resolve(stdout);
10
- return;
11
13
  }
12
- reject(error);
13
14
  });
14
15
  });
15
16
  };
@@ -10,7 +10,7 @@
10
10
  "@yeoman/adapter@2.0.0",
11
11
  "@yeoman/types@1.5.0",
12
12
  "mem-fs@4.1.2",
13
- "yeoman-generator@7.5.0"
13
+ "yeoman-generator@7.5.1"
14
14
  ],
15
15
  "lockfileEntries": {
16
16
  "@babel/code-frame@^7.22.13": "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85",
@@ -277,7 +277,7 @@
277
277
  "wcwidth@^1.0.1": "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8",
278
278
  "which@^2.0.1": "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1",
279
279
  "wrap-ansi@^6.2.0": "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53",
280
- "yeoman-generator@7.5.0": "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-7.5.0.tgz#f9865401088e64da9e04525de0063a52e7bbda8e",
280
+ "yeoman-generator@7.5.1": "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-7.5.1.tgz#3354691050ca0fbb337e68bfeb21dc247395fa5c",
281
281
  "yoctocolors-cjs@^2.1.2": "https://registry.yarnpkg.com/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz#f4b905a840a37506813a7acaa28febe97767a242",
282
282
  "yoctocolors@^2.1.1": "https://registry.yarnpkg.com/yoctocolors/-/yoctocolors-2.1.1.tgz#e0167474e9fbb9e8b3ecca738deaa61dd12e56fc"
283
283
  },
@@ -83,7 +83,7 @@ export declare abstract class TasksMixin {
83
83
  * @param args: Task arguments.
84
84
  * @param taskStatus.
85
85
  */
86
- executeTask(this: BaseGeneratorImpl, task: Task, args?: any[] | ((generator: Generator) => any[]), taskStatus?: TaskStatus | undefined): Promise<void>;
86
+ executeTask(this: BaseGeneratorImpl, task: Task, args?: any[] | ((generator: Generator) => any[]) | undefined, taskStatus?: TaskStatus | undefined): Promise<void>;
87
87
  /**
88
88
  * Ignore cancellable tasks.
89
89
  */
@@ -22,15 +22,15 @@ export class TasksMixin {
22
22
  * Register priorities for this generator
23
23
  */
24
24
  registerPriorities(priorities) {
25
- priorities = priorities.filter(priority => {
26
- if (priority.edit) {
27
- const queue = this._queues[priority.priorityName];
25
+ priorities = priorities.filter(({ priorityName, edit, ...priority }) => {
26
+ if (edit) {
27
+ const queue = this._queues[priorityName];
28
28
  if (!queue) {
29
- throw new Error(`Error editing priority ${priority.priorityName}, not found`);
29
+ throw new Error(`Error editing priority ${priorityName}, not found`);
30
30
  }
31
31
  Object.assign(queue, { ...priority, edit: undefined });
32
32
  }
33
- return !priority.edit;
33
+ return !edit;
34
34
  });
35
35
  const customPriorities = priorities.map(customPriority => ({ ...customPriority }));
36
36
  // Sort customPriorities, a referenced custom queue must be added before the one that reference it.
@@ -241,17 +241,17 @@ export class TasksMixin {
241
241
  * @param args: Task arguments.
242
242
  * @param taskStatus.
243
243
  */
244
- async executeTask(task, args = task.args ?? this.args, taskStatus = this._taskStatus) {
244
+ async executeTask(task, args = task.args, taskStatus = this._taskStatus) {
245
245
  const { reject, queueName = 'default', taskName: methodName, method } = task;
246
246
  const { _namespace: namespace } = this;
247
- const priority = Object.entries(this._queues).find(([_, options]) => options.queueName === queueName);
248
- const priorityName = priority ? priority[0] : undefined;
249
247
  debug(`Running ${namespace}#${methodName}`);
250
248
  this.emit(`method:${methodName}`);
251
249
  const taskCancelled = task.cancellable && taskStatus?.cancelled;
252
250
  if (taskCancelled) {
253
251
  return;
254
252
  }
253
+ const [priorityName, priority] = Object.entries(this._queues).find(([_, queue]) => queue.queueName === queueName) ?? [];
254
+ args ??= priority?.args ?? this.args;
255
255
  args = typeof args === 'function' ? args(this) : args;
256
256
  this.runningState = { namespace, queueName, methodName };
257
257
  try {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yeoman-generator",
3
- "version": "7.5.0",
3
+ "version": "7.5.1",
4
4
  "description": "Rails-inspired generator system that provides scaffolding for your apps",
5
5
  "keywords": [
6
6
  "development",
@@ -11,7 +11,7 @@
11
11
  "extnerl-adapter-generator"
12
12
  ],
13
13
  "devDependencies": {
14
- "yeoman-generator": "7.5.0",
14
+ "yeoman-generator": "7.5.1",
15
15
  "@yeoman/types": "1.5.0",
16
16
  "mem-fs": "4.1.2",
17
17
  "@yeoman/adapter": "2.0.0",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainlink/external-adapter-framework",
3
- "version": "2.2.1",
3
+ "version": "2.3.0",
4
4
  "main": "dist/index.js",
5
5
  "license": "MIT",
6
6
  "dependencies": {
@@ -40,8 +40,8 @@
40
40
  "@types/node": "22.13.10",
41
41
  "@types/sinonjs__fake-timers": "8.1.5",
42
42
  "@types/ws": "8.18.0",
43
- "@typescript-eslint/eslint-plugin": "8.26.0",
44
- "@typescript-eslint/parser": "8.26.0",
43
+ "@typescript-eslint/eslint-plugin": "8.27.0",
44
+ "@typescript-eslint/parser": "8.27.0",
45
45
  "ava": "6.2.0",
46
46
  "axios-mock-adapter": "2.1.0",
47
47
  "c8": "10.1.3",
@@ -52,7 +52,7 @@
52
52
  "prettier": "3.5.3",
53
53
  "ts-node": "10.9.2",
54
54
  "ts-node-dev": "2.0.0",
55
- "typedoc": "0.27.9",
55
+ "typedoc": "0.28.1",
56
56
  "typescript": "5.8.2"
57
57
  },
58
58
  "prettier": {
package/util/index.d.ts CHANGED
@@ -66,3 +66,21 @@ export declare const splitArrayIntoChunks: <T>(array: T[], size: number) => T[][
66
66
  * and the values are array of items with that key
67
67
  */
68
68
  export declare const groupArrayByKey: <T extends Record<string, string>, K extends keyof T>(array: T[], key: K) => Record<T[K], T[]>;
69
+ /**
70
+ * Returns adapter name in lower case and with hyphens replaced by underscores.
71
+ * Types are declared such that the output type is defined iff the input type
72
+ * is defined.
73
+ * @param name - The name to canonicalize
74
+ * @returns The canonical name
75
+ */
76
+ export declare function getCanonicalAdapterName(name: string): string;
77
+ export declare function getCanonicalAdapterName(name: undefined): undefined;
78
+ type StringKeys<T> = {
79
+ [key: string]: T;
80
+ };
81
+ /**
82
+ * Returns the record with adapter names as keys after canonicalizing the keys.
83
+ * @param obj - The record with adapter names as keys
84
+ * @returns The record with canonicalized adapter names as keys
85
+ */
86
+ export declare const canonicalizeAdapterNameKeys: <T>(obj: StringKeys<T> | undefined) => StringKeys<T> | undefined;
package/util/index.js CHANGED
@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.groupArrayByKey = exports.splitArrayIntoChunks = exports.hasRepeatedValues = exports.deferredPromise = exports.timeoutPromise = exports.DoubleLinkedList = exports.LinkedListNode = exports.sleep = void 0;
17
+ exports.canonicalizeAdapterNameKeys = exports.groupArrayByKey = exports.splitArrayIntoChunks = exports.hasRepeatedValues = exports.deferredPromise = exports.timeoutPromise = exports.DoubleLinkedList = exports.LinkedListNode = exports.sleep = void 0;
18
+ exports.getCanonicalAdapterName = getCanonicalAdapterName;
18
19
  __exportStar(require("./logger"), exports);
19
20
  __exportStar(require("./subscription-set/subscription-set"), exports);
20
21
  __exportStar(require("./types"), exports);
@@ -158,4 +159,19 @@ const groupArrayByKey = (array, key) => {
158
159
  }, {});
159
160
  };
160
161
  exports.groupArrayByKey = groupArrayByKey;
162
+ function getCanonicalAdapterName(name) {
163
+ return name?.toLowerCase().replace(/-/g, '_');
164
+ }
165
+ /**
166
+ * Returns the record with adapter names as keys after canonicalizing the keys.
167
+ * @param obj - The record with adapter names as keys
168
+ * @returns The record with canonicalized adapter names as keys
169
+ */
170
+ const canonicalizeAdapterNameKeys = (obj) => {
171
+ if (obj === undefined) {
172
+ return undefined;
173
+ }
174
+ return Object.fromEntries(Object.entries(obj).map(([key, value]) => [getCanonicalAdapterName(key), value]));
175
+ };
176
+ exports.canonicalizeAdapterNameKeys = canonicalizeAdapterNameKeys;
161
177
  //# sourceMappingURL=index.js.map
package/util/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"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"}