Merge pull request #880 from isamu/fixType

Fix type

packages/graphai/src/graphai.ts

@@ -11,18 +11,18 @@ import {
   PropFunction,
   GraphDataLoader,
   ConfigDataDictionary,
-} from "@/type";
-import { TransactionLog } from "@/transaction_log";
+} from "./type";
+import { TransactionLog } from "./transaction_log";
 
-import { ComputedNode, StaticNode, GraphNodes } from "@/node";
+import { ComputedNode, StaticNode, GraphNodes } from "./node";
 
-import { resultsOf, resultOf, cleanResult } from "@/utils/result";
-import { propFunctions } from "@/utils/prop_function";
-import { parseNodeName, assert, isLogicallyTrue } from "@/utils/utils";
-import { getDataFromSource } from "@/utils/data_source";
+import { resultsOf, resultOf, cleanResult } from "./utils/result";
+import { propFunctions } from "./utils/prop_function";
+import { parseNodeName, assert, isLogicallyTrue } from "./utils/utils";
+import { getDataFromSource } from "./utils/data_source";
 
-import { validateGraphData, validateAgent } from "@/validator";
-import { TaskManager } from "@/task_manager";
+import { validateGraphData, validateAgent } from "./validator";
+import { TaskManager } from "./task_manager";
 
 export const defaultConcurrency = 8;
 export const graphDataLatestVersion = 0.5;

packages/graphai/src/index.ts

@@ -1,6 +1,6 @@
 export { GraphAI, defaultConcurrency, graphDataLatestVersion } from "./graphai";
 
-export {
+export type {
   AgentFunction,
   AgentFunctionInfo,
   AgentFunctionInfoDictionary,
@@ -9,7 +9,6 @@ export {
   GraphData,
   ResultDataDictionary,
   ResultData,
-  NodeState,
   AgentFilterFunction,
   AgentFilterInfo,
   NodeData,
@@ -20,7 +19,11 @@ export {
   DefaultParamsType,
   GraphDataLoaderOption,
   GraphDataLoader,
-} from "@/type";
+} from "./type";
+
+export {
+  NodeState,
+} from "./type";
 
 export type { TransactionLog } from "./transaction_log";
 

packages/graphai/src/node.ts

@@ -1,6 +1,6 @@
-import type { GraphAI, GraphData } from "@/index";
-import { strIntentionalError } from "@/utils/utils";
-import { inputs2dataSources, dataSourceNodeIds } from "@/utils/nodeUtils";
+import type { GraphAI, GraphData } from "./index";
+import { strIntentionalError } from "./utils/utils";
+import { inputs2dataSources, dataSourceNodeIds } from "./utils/nodeUtils";
 
 import {
   NodeDataParams,
@@ -18,10 +18,10 @@ import {
   PassThrough,
   ConsoleElement,
   ConfigData,
-} from "@/type";
-import { parseNodeName, assert, isLogicallyTrue, isObject } from "@/utils/utils";
-import { TransactionLog } from "@/transaction_log";
-import { resultsOf } from "@/utils/result";
+} from "./type";
+import { parseNodeName, assert, isLogicallyTrue, isObject } from "./utils/utils";
+import { TransactionLog } from "./transaction_log";
+import { resultsOf } from "./utils/result";
 
 export class Node {
   public readonly nodeId: string;

packages/graphai/src/task_manager.ts

@@ -1,5 +1,5 @@
-import { ComputedNode } from "@/node";
-import { assert } from "@/utils/utils";
+import { ComputedNode } from "./node";
+import { assert } from "./utils/utils";
 
 type TaskEntry = {
   node: ComputedNode;

packages/graphai/src/transaction_log.ts

@@ -1,8 +1,8 @@
-import { ResultData, NodeDataParams, NodeState } from "@/type";
-import type { GraphAI } from "@/graphai";
-import type { ComputedNode, StaticNode } from "@/node";
-import { debugResultKey } from "@/utils/utils";
-import { dataSourceNodeIds } from "@/utils/nodeUtils";
+import { ResultData, NodeDataParams, NodeState } from "./type";
+import type { GraphAI } from "./graphai";
+import type { ComputedNode, StaticNode } from "./node";
+import { debugResultKey } from "./utils/utils";
+import { dataSourceNodeIds } from "./utils/nodeUtils";
 
 export class TransactionLog {
   public nodeId: string;

packages/graphai/src/type.ts

@@ -1,5 +1,5 @@
-import type { TransactionLog } from "@/transaction_log";
-import type { TaskManager } from "@/task_manager";
+import type { TransactionLog } from "./transaction_log";
+import type { TaskManager } from "./task_manager";
 
 export enum NodeState {
   Waiting = "waiting",

packages/graphai/src/utils/data_source.ts

@@ -1,4 +1,4 @@
-import { ResultData, DataSource, PropFunction } from "@/type";
+import { ResultData, DataSource, PropFunction } from "../type";
 import { isObject, isNull } from "./utils";
 import { propFunctionRegex } from "./prop_function";
 

packages/graphai/src/utils/nodeUtils.ts

@@ -1,5 +1,5 @@
 import { parseNodeName, isObject } from "./utils";
-import { DataSource } from "@/type";
+import { DataSource } from "../type";
 
 // for dataSource
 export const inputs2dataSources = (inputs: any): DataSource[] => {

packages/graphai/src/utils/prop_function.ts

@@ -1,4 +1,4 @@
-import { PropFunction } from "@/type";
+import { PropFunction } from "../type";
 import { isObject } from "./utils";
 
 export const propFunctionRegex = /^[a-zA-Z]+\([^)]*\)$/;

packages/graphai/src/utils/result.ts

@@ -1,9 +1,9 @@
-import { DataSource, ResultData, PropFunction } from "@/type";
+import { DataSource, ResultData, PropFunction } from "../type";
 
-import { GraphNodes } from "@/node";
+import { GraphNodes } from "../node";
 
-import { parseNodeName, isNamedInputs, isObject, isNull } from "@/utils/utils";
-import { getDataFromSource } from "@/utils/data_source";
+import { parseNodeName, isNamedInputs, isObject, isNull } from "./utils";
+import { getDataFromSource } from "./data_source";
 
 const resultsOfInner = (input: any, nodes: GraphNodes, propFunctions: PropFunction[], isSelfNode: boolean = false): ResultData => {
   if (Array.isArray(input)) {

packages/graphai/src/utils/utils.ts

@@ -1,4 +1,4 @@
-import { DataSource, AgentFunction, DefaultInputData } from "@/type";
+import { DataSource, AgentFunction, DefaultInputData } from "../type";
 
 export const sleep = async (milliseconds: number) => {
   return await new Promise((resolve) => setTimeout(resolve, milliseconds));

packages/graphai/src/validator.ts

@@ -1,13 +1,13 @@
-import { GraphData, AgentFunctionInfoDictionary } from "@/type";
+import { GraphData, AgentFunctionInfoDictionary } from "./type";
 
-import { graphNodesValidator, graphDataValidator } from "@/validators/graph_data_validator";
-import { nodeValidator } from "@/validators/nodeValidator";
-import { staticNodeValidator } from "@/validators/static_node_validator";
-import { computedNodeValidator } from "@/validators/computed_node_validator";
-import { relationValidator } from "@/validators/relation_validator";
-import { agentValidator } from "@/validators/agent_validator";
+import { graphNodesValidator, graphDataValidator } from "./validators/graph_data_validator";
+import { nodeValidator } from "./validators/nodeValidator";
+import { staticNodeValidator } from "./validators/static_node_validator";
+import { computedNodeValidator } from "./validators/computed_node_validator";
+import { relationValidator } from "./validators/relation_validator";
+import { agentValidator } from "./validators/agent_validator";
 
-import { ValidationError } from "@/validators/common";
+import { ValidationError } from "./validators/common";
 
 export const validateGraphData = (data: GraphData, agentIds: string[]) => {
   graphNodesValidator(data);

packages/graphai/src/validators/agent_validator.ts

@@ -1,4 +1,4 @@
-import { ValidationError } from "@/validators/common";
+import { ValidationError } from "./common";
 
 export const agentValidator = (graphAgentIds: Set<string>, agentIds: Set<string>) => {
   graphAgentIds.forEach((agentId) => {

packages/graphai/src/validators/computed_node_validator.ts

@@ -1,5 +1,5 @@
-import { ComputedNodeData } from "@/type";
-import { computedNodeAttributeKeys, ValidationError } from "@/validators/common";
+import { ComputedNodeData } from "../type";
+import { computedNodeAttributeKeys, ValidationError } from "./common";
 
 export const computedNodeValidator = (nodeData: ComputedNodeData) => {
   Object.keys(nodeData).forEach((key) => {

packages/graphai/src/validators/graph_data_validator.ts

@@ -1,5 +1,5 @@
-import { GraphData } from "@/type";
-import { graphDataAttributeKeys, ValidationError } from "@/validators/common";
+import { GraphData } from "../type";
+import { graphDataAttributeKeys, ValidationError } from "./common";
 
 export const graphNodesValidator = (data: GraphData) => {
   if (data.nodes === undefined) {

packages/graphai/src/validators/nodeValidator.ts

@@ -1,5 +1,5 @@
-import { NodeData, StaticNodeData, ComputedNodeData } from "@/type";
-import { ValidationError } from "@/validators/common";
+import { NodeData, StaticNodeData, ComputedNodeData } from "../type";
+import { ValidationError } from "./common";
 
 export const nodeValidator = (nodeData: NodeData) => {
   if ((nodeData as ComputedNodeData).agent && (nodeData as StaticNodeData).value) {

packages/graphai/src/validators/relation_validator.ts

@@ -1,7 +1,7 @@
-import { GraphData } from "@/type";
-import { parseNodeName } from "@/utils/utils";
-import { ValidationError } from "@/validators/common";
-import { inputs2dataSources, dataSourceNodeIds } from "@/utils/nodeUtils";
+import { GraphData } from "../type";
+import { parseNodeName } from "../utils/utils";
+import { inputs2dataSources, dataSourceNodeIds } from "../utils/nodeUtils";
+import { ValidationError } from "./common";
 
 export const relationValidator = (graphData: GraphData, staticNodeIds: string[], computedNodeIds: string[]) => {
   const nodeIds = new Set<string>(Object.keys(graphData.nodes));

packages/graphai/src/validators/static_node_validator.ts

@@ -1,5 +1,5 @@
-import { StaticNodeData } from "@/type";
-import { staticNodeAttributeKeys, ValidationError } from "@/validators/common";
+import { StaticNodeData } from "../type";
+import { staticNodeAttributeKeys, ValidationError } from "./common";
 
 export const staticNodeValidator = (nodeData: StaticNodeData) => {
   Object.keys(nodeData).forEach((key) => {