Merge remote-tracking branch 'oveddan/oveddan-improvements'

apps/exec-graph/src/index.ts

@@ -4,18 +4,14 @@ import process from 'node:process';
 import {
  DefaultLogger,
  Engine,
+ getCoreNodeDefinitions,
+ getCoreValueTypes,
  Logger,
  ManualLifecycleEventEmitter,
  parseSafeFloat,
  readGraphFromJSON,
- registerCoreProfile,
- registerLifecycleEventEmitter,
- registerLogger,
- registerSceneProfile,
- Registry,
  validateGraph,
- validateRegistry,
- writeGraphToJSON
+ validateRegistry
 } from '@behave-graph/core';
 import { program } from 'commander';
 import { createRequire } from 'module';
@@ -40,28 +36,30 @@ async function execGraph({
  jsonPattern: string;
  programOptions: ProgramOptions;
 }) {
- const registry = new Registry();
- const manualLifecycleEventEmitter = new ManualLifecycleEventEmitter();
+ const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
  const logger = new DefaultLogger();
- registerCoreProfile(registry);
- registerSceneProfile(registry);
- registerLogger(registry.dependencies, logger);
- registerLifecycleEventEmitter(
- registry.dependencies,
- manualLifecycleEventEmitter
- );
+ const valueTypeMap = getCoreValueTypes();
+ const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
 
  const graphJsonPath = jsonPattern;
  Logger.verbose(`reading behavior graph: ${graphJsonPath}`);
  const textFile = await fs.readFile(graphJsonPath);
- const graph = readGraphFromJSON(
- JSON.parse(textFile.toString('utf8')),
- registry
- );
+ const graph = readGraphFromJSON({
+ graphJson: JSON.parse(textFile.toString('utf8')),
+ nodes: nodeDefinitionMap,
+ values: valueTypeMap,
+ dependencies: {
+ logger,
+ lifecycleEventEmitter
+ }
+ });
  graph.name = graphJsonPath;
 
  const errorList: string[] = [];
- errorList.push(...validateRegistry(registry), ...validateGraph(graph));
+ errorList.push(
+ ...validateRegistry({ nodes: nodeDefinitionMap, values: valueTypeMap }),
+ ...validateGraph(graph)
+ );
 
  if (errorList.length > 0) {
  Logger.error(`${errorList.length} errors found:`);
@@ -71,13 +69,13 @@ async function execGraph({
  return;
  }
 
- if (programOptions.upgrade) {
+ /* if (programOptions.upgrade) {
  const newGraphJson = writeGraphToJSON(graph);
  await fs.writeFile(graphJsonPath, JSON.stringify(newGraphJson, null, 2));
- }
+ }*/
 
  Logger.verbose('creating behavior graph');
- const engine = new Engine(graph);
+ const engine = new Engine(graph.nodes);
 
  if (programOptions.trace) {
  engine.onNodeExecutionStart.addListener((node) =>
@@ -93,29 +91,29 @@ async function execGraph({
  }
 
  const startTime = Date.now();
- if (manualLifecycleEventEmitter.startEvent.listenerCount > 0) {
+ if (lifecycleEventEmitter.startEvent.listenerCount > 0) {
  Logger.verbose('triggering start event');
- manualLifecycleEventEmitter.startEvent.emit();
+ lifecycleEventEmitter.startEvent.emit();
 
  Logger.verbose('executing all (async)');
  await engine.executeAllAsync(5);
  }
 
- if (manualLifecycleEventEmitter.tickEvent.listenerCount > 0) {
+ if (lifecycleEventEmitter.tickEvent.listenerCount > 0) {
  const iterations = parseSafeFloat(programOptions.iterations, 5);
  for (let tick = 0; tick < iterations; tick++) {
  Logger.verbose(`triggering tick (${tick} of ${iterations})`);
- manualLifecycleEventEmitter.tickEvent.emit();
+ lifecycleEventEmitter.tickEvent.emit();
 
  Logger.verbose('executing all (async)');
  // eslint-disable-next-line no-await-in-loop
  await engine.executeAllAsync(5);
  }
  }
 
- if (manualLifecycleEventEmitter.endEvent.listenerCount > 0) {
+ if (lifecycleEventEmitter.endEvent.listenerCount > 0) {
  Logger.verbose('triggering end event');
- manualLifecycleEventEmitter.endEvent.emit();
+ lifecycleEventEmitter.endEvent.emit();
 
  Logger.verbose('executing all (async)');
  await engine.executeAllAsync(5);

apps/export-node-spec/package.json

@@ -1,6 +1,7 @@
 {
  "name": "export-node-spec",
  "version": "0.0.1",
+ "private": true,
  "type": "module",
  "bin": "./bin/cli.js",
  "types": "./dist/index.d.ts",

apps/export-node-spec/src/index.ts

@@ -1,10 +1,11 @@
 import { promises as fs } from 'node:fs';
 
 import {
+ DefaultLogger,
+ getCoreNodeDefinitions,
+ getCoreValueTypes,
  Logger,
- registerCoreProfile,
- registerSceneProfile,
- Registry,
+ ManualLifecycleEventEmitter,
  validateNodeRegistry,
  writeNodeSpecsToJSON
 } from '@behave-graph/core';
@@ -34,12 +35,15 @@ export const main = async () => {
  throw new Error('no path specified');
  }
 
- const registry = new Registry();
- registerCoreProfile(registry);
- registerSceneProfile(registry);
+ const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
+ const logger = new DefaultLogger();
+ const valueTypeMap = getCoreValueTypes();
+ const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
 
  const errorList: string[] = [];
- errorList.push(...validateNodeRegistry(registry));
+ errorList.push(
+ ...validateNodeRegistry({ nodes: nodeDefinitionMap, values: valueTypeMap })
+ );
  if (errorList.length > 0) {
  Logger.error(`${errorList.length} errors found:`);
  errorList.forEach((errorText, errorIndex) => {
@@ -48,7 +52,14 @@ export const main = async () => {
  return;
  }
 
- const nodeSpecJson = writeNodeSpecsToJSON(registry);
+ const nodeSpecJson = writeNodeSpecsToJSON({
+ nodes: nodeDefinitionMap,
+ values: valueTypeMap,
+ dependencies: {
+ logger,
+ lifecycleEventEmitter
+ }
+ });
  nodeSpecJson.sort((a, b) => a.type.localeCompare(b.type));
  const jsonOutput = JSON.stringify(nodeSpecJson, null, ' ');
  if (programOptions.csv) {

apps/graph-editor/package.json

@@ -1,6 +1,7 @@
 {
  "name": "graph-editor",
  "version": "1.0.0",
+ "private": true,
  "type": "module",
  "scripts": {
  "build": "tsc --noEmit && esbuild src/index.tsx --target=es2020 --bundle --minify --outfile=public/js/index.js",
@@ -9,7 +10,9 @@
  "dependencies": {
  "@behave-graph/core": "*",
  "@behave-graph/flow": "*",
- "three": "^0.145.0"
+ "@types/three": "0.152.1",
+ "three": "0.152.2",
+ "three-stdlib": "^2.22.4"
  },
  "devDependencies": {
  "@vitejs/plugin-react": "^2.2.0",

apps/graph-editor/src/index.tsx

@@ -6,20 +6,19 @@ import { Examples, Flow } from '@behave-graph/flow';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 
+import Branch from '../../../graphs/core/flow/Branch.json';
+import HelloWorld from '../../../graphs/core/HelloWorld.json';
+import Polynomial from '../../../graphs/core/logic/Polynomial.json';
+import Delay from '../../../graphs/core/time/Delay.json';
+import SetGet from '../../../graphs/core/variables/SetGet.json';
 import rawGraph from './graph.json';
 
-const graph = rawGraph as any as GraphJSON;
+const graph = rawGraph as unknown as GraphJSON;
 
 const root = ReactDOM.createRoot(
  document.getElementById('root') as HTMLElement
 );
 
-import HelloWorld from '../../../graphs/core//HelloWorld.json';
-import Branch from '../../../graphs/core/flow/Branch.json';
-import Polynomial from '../../../graphs/core/logic/Polynomial.json';
-import Delay from '../../../graphs/core/time/Delay.json';
-import SetGet from '../../../graphs/core/variables/SetGet.json';
-
 // TODO remove when json types fixed in behave-graph
 const examples: Examples = {
  branch: Branch as unknown as GraphJSON,
@@ -31,6 +30,6 @@ const examples: Examples = {
 
 root.render(
  <React.StrictMode>
- <Flow graph={graph} examples={examples} />
+ <Flow initialGraph={graph} examples={examples} />
  </React.StrictMode>
 );

apps/three-viewer/package.json

@@ -1,6 +1,7 @@
 {
  "name": "three-viewer",
  "version": "1.0.0",
+ "private": true,
  "type": "module",
  "scripts": {
  "build": "tsc --noEmit && esbuild src/index.ts --target=es2020 --bundle --minify --outfile=public/js/index.js",