fluencelabs/fluence-js
1
0
Fork 0
mirror of https://github.com/fluencelabs/fluence-js.git synced 2025-06-27 14:51:32 +00:00
Code Issues Projects Releases Wiki Activity

Refactor types

Browse Source
This commit is contained in:
Akim Mamedov
2024-03-04 18:56:50 +07:00
parent 6755f57b06
commit f7940618a1
4 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/aqua-to-js/src/generate/service.ts
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
import { JSONValue, ServiceDef } from "@fluencelabs/interfaces";
import { ServiceDef } from "@fluencelabs/interfaces";
import { recursiveRenameLaquaProps } from "../utils.js";
@ -63,6 +63,6 @@ function generateRegisterServiceOverload(
}
function serviceToJson(service: ServiceDef): string {
const record: Record<never, JSONValue> = service;
const record: Record<never, unknown> = service;
return JSON.stringify(recursiveRenameLaquaProps(record), null, 4);
}

13
packages/core/aqua-to-js/src/utils.ts
View File

@ -20,7 +20,6 @@ import { join } from "path";
import {
ArrowType,
ArrowWithoutCallbacks,
JSONValue,
LabeledProductType,
NilType,
SimpleTypes,
@ -67,7 +66,7 @@ export function getFuncArgs(
}
}
export function recursiveRenameLaquaProps(obj: JSONValue): unknown {
export function recursiveRenameLaquaProps(obj: unknown): unknown {
if (typeof obj !== "object" || obj === null) {
return obj;
}
@ -78,7 +77,9 @@ export function recursiveRenameLaquaProps(obj: JSONValue): unknown {
});
}
return Object.getOwnPropertyNames(obj).reduce((acc, prop) => {
const objType: {} = obj;
return Object.getOwnPropertyNames(objType).reduce((acc, prop) => {
let accessProp = prop;
if (prop.includes("Laqua_js")) {
@ -89,12 +90,14 @@ export function recursiveRenameLaquaProps(obj: JSONValue): unknown {
throw new Error(`Bad property name: ${prop}.`);
}
if (refinedProperty in obj) {
if (refinedProperty in objType) {
accessProp = refinedProperty;
}
}
const laquaProp = obj[accessProp];
const accessObj: Record<string, unknown> = objType;
const laquaProp = accessObj[accessProp];
if (laquaProp === undefined) {
return acc;