refactor profile registration.

apps/exec-graph/src/index.ts

@@ -4,12 +4,11 @@ import process from 'node:process';
 import {
   DefaultLogger,
   Engine,
-  getCoreNodeDefinitions,
-  getCoreValueTypes,
   Logger,
   ManualLifecycleEventEmitter,
   parseSafeFloat,
   readGraphFromJSON,
+  registerCoreProfile,
   validateGraph,
   validateRegistry
 } from '@behave-graph/core';
@@ -38,16 +37,14 @@ async function execGraph({
 }) {
   const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
   const logger = new DefaultLogger();
-  const valueTypeMap = getCoreValueTypes();
-  const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
+  const registry = registerCoreProfile({ values: {}, nodes: {} });
 
   const graphJsonPath = jsonPattern;
   Logger.verbose(`reading behavior graph: ${graphJsonPath}`);
   const textFile = await fs.readFile(graphJsonPath);
   const graph = readGraphFromJSON({
     graphJson: JSON.parse(textFile.toString('utf8')),
-    nodes: nodeDefinitionMap,
-    values: valueTypeMap,
+    ...registry,
     dependencies: {
       logger,
       lifecycleEventEmitter
@@ -56,10 +53,7 @@ async function execGraph({
   graph.name = graphJsonPath;
 
   const errorList: string[] = [];
-  errorList.push(
-    ...validateRegistry({ nodes: nodeDefinitionMap, values: valueTypeMap }),
-    ...validateGraph(graph)
-  );
+  errorList.push(...validateRegistry(registry), ...validateGraph(graph));
 
   if (errorList.length > 0) {
     Logger.error(`${errorList.length} errors found:`);

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

@@ -2,10 +2,9 @@ import { promises as fs } from 'node:fs';
 
 import {
   DefaultLogger,
-  getCoreNodeDefinitions,
-  getCoreValueTypes,
   Logger,
   ManualLifecycleEventEmitter,
+  registerCoreProfile,
   validateNodeRegistry,
   writeNodeSpecsToJSON
 } from '@behave-graph/core';
@@ -37,13 +36,11 @@ export const main = async () => {
 
   const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
   const logger = new DefaultLogger();
-  const valueTypeMap = getCoreValueTypes();
-  const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
+
+  const registry = registerCoreProfile({ values: {}, nodes: {} });
 
   const errorList: string[] = [];
-  errorList.push(
-    ...validateNodeRegistry({ nodes: nodeDefinitionMap, values: valueTypeMap })
-  );
+  errorList.push(...validateNodeRegistry(registry));
   if (errorList.length > 0) {
     Logger.error(`${errorList.length} errors found:`);
     errorList.forEach((errorText, errorIndex) => {
@@ -53,8 +50,7 @@ export const main = async () => {
   }
 
   const nodeSpecJson = writeNodeSpecsToJSON({
-    nodes: nodeDefinitionMap,
-    values: valueTypeMap,
+    ...registry,
     dependencies: {
       logger,
       lifecycleEventEmitter

apps/three-viewer/src/index.ts

@@ -2,22 +2,18 @@
 import {
   DefaultLogger,
   Engine,
+  getCoreNodeDefinitions,
+  getCoreValueMap as getCoreValueMap,
   Logger,
   ManualLifecycleEventEmitter,
   readGraphFromJSON,
-  registerCoreProfile,
-  registerLifecycleEventEmitter,
-  registerLogger,
-  registerSceneDependency,
-  registerSceneProfile,
-  Registry,
   validateGraph,
-  validateRegistry
+  validateRegistry,
+  ValueType
 } from '@behave-graph/core';
+import { getSceneNodeDefinitions, getSceneValueMap } from '@behave-graph/scene';
 import * as THREE from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
-import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
+import { GLTFLoader, OrbitControls, RGBELoader } from 'three-stdlib';
 
 import { ThreeScene } from './ThreeScene.js';
 
@@ -65,19 +61,18 @@ async function loadThreeScene() {
 }
 
 async function main() {
-  const registry = new Registry();
-  const manualLifecycleEventEmitter = new ManualLifecycleEventEmitter();
+  const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
   const logger = new DefaultLogger();
 
-  const { threeScene, gltf } = await loadThreeScene();
+  const valueTypeMap: Record<string, ValueType<any, any>> = {
+    ...getCoreValueMap(),
+    ...getSceneValueMap()
+  };
 
-  registerCoreProfile(registry);
-  registerSceneProfile(registry);
-  registerLogger(registry.dependencies, logger);
-  registerLifecycleEventEmitter(
-    registry.dependencies,
-    manualLifecycleEventEmitter
-  );
+  const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
+  const sceneNodeDefinitionMap = getSceneNodeDefinitions(valueTypeMap);
+
+  const { threeScene, gltf } = await loadThreeScene();
 
   const graphJsonPath = publicImageUrl(
     `/graphs/scene/actions/SpinningSuzanne.json`

packages/core/src/Profiles/Core/readCoreGraphs.test.ts

@@ -19,10 +19,10 @@ import { validateGraphAcyclic } from '../../Graphs/Validation/validateGraphAcycl
 import { validateGraphLinks } from '../../Graphs/Validation/validateGraphLinks.js';
 import {
   getCoreNodeDefinitions,
-  getCoreValueTypes
+  getCoreValueMap
 } from './registerCoreProfile.js';
 
-const valueTypes = getCoreValueTypes();
+const valueTypes = getCoreValueMap();
 const nodeDefinitions = getCoreNodeDefinitions(valueTypes);
 
 Logger.onWarn.clear();

packages/core/src/Profiles/Core/registerCoreProfile.ts

@@ -1,9 +1,8 @@
 /* eslint-disable max-len */
-import {
-  NodeDefinition,
-  NodeDefinitionsMap
-} from '../../Nodes/Registry/NodeDefinitionsMap.js';
+import { NodeDefinition } from '../../Nodes/Registry/NodeDefinitionsMap.js';
 import { getNodeDescriptions } from '../../Nodes/Registry/NodeDescription.js';
+import { IRegistry } from '../../Registry.js';
+import { ValueType } from '../../Values/ValueType.js';
 import { ValueTypeMap } from '../../Values/ValueTypeMap.js';
 import { getStringConversionsForValueType } from '../registerSerializersForValueType.js';
 import { ILifecycleEventEmitter } from './Abstractions/ILifecycleEventEmitter.js';
@@ -47,42 +46,38 @@ import { VariableGet } from './Variables/VariableGet.js';
 import { VariableSet } from './Variables/VariableSet.js';
 
 export const makeCoreDependencies = ({
-  lifecyleEmitter,
+  lifecycleEmitter,
   logger
 }: {
-  lifecyleEmitter: ILifecycleEventEmitter;
+  lifecycleEmitter: ILifecycleEventEmitter;
   logger: ILogger;
 }) => ({
-  [lifecycleEventEmitterDependencyKey]: lifecyleEmitter,
+  [lifecycleEventEmitterDependencyKey]: lifecycleEmitter,
   [loggerDependencyKey]: logger
 });
 
-export function getCoreValueTypes(): ValueTypeMap {
-  return toMap(
-    [BooleanValue, StringValue, IntegerValue, FloatValue],
-    (v) => v.name
-  );
-}
+export const CoreValueTypes: ValueType[] = [
+  BooleanValue,
+  StringValue,
+  IntegerValue,
+  FloatValue
+];
 
-export function toMap<T>(
-  elements: T[],
-  getName: (element: T) => string
-): Record<string, T> {
-  return Object.fromEntries(
-    elements.map((element) => [getName(element), element])
-  );
-}
+export const CoreValueMap: ValueTypeMap = Object.fromEntries(
+  CoreValueTypes.map((valueType) => [valueType.name, valueType])
+);
+
+export const CoreValueNames = Object.keys(CoreValueMap);
 
 function getStringConversions(values: ValueTypeMap): NodeDefinition[] {
-  return ['boolean', 'float', 'integer'].flatMap((valueTypeName) =>
-    getStringConversionsForValueType({ values, valueTypeName })
+  return CoreValueNames.filter((name) => name !== 'string').flatMap(
+    (valueTypeName) =>
+      getStringConversionsForValueType({ values, valueTypeName })
   );
 }
 
-export function getCoreNodeDefinitions(
-  values: ValueTypeMap
-): NodeDefinitionsMap {
-  const allNodeDefinitions: NodeDefinition[] = [
+export function getCoreNodeDefinitions(values: ValueTypeMap): NodeDefinition[] {
+  return [
     ...getNodeDescriptions(StringNodes),
     ...getNodeDescriptions(BooleanNodes),
     ...getNodeDescriptions(IntegerNodes),
@@ -137,15 +132,22 @@ export function getCoreNodeDefinitions(
 
     ...getStringConversions(values)
   ];
-
-  // convert array to map
-  return toMap(allNodeDefinitions, (node) => node.typeName);
 }
 
-export const getCoreRegistry = () => {
-  const values = getCoreValueTypes();
+export const getCoreDefinitionMap = (
+  values: Record<string, ValueType>
+): Record<string, NodeDefinition> =>
+  Object.fromEntries(
+    getCoreNodeDefinitions(values).map((nodeDefinition) => [
+      nodeDefinition.typeName,
+      nodeDefinition
+    ])
+  );
+
+export const registerCoreProfile = (registry: IRegistry): IRegistry => {
+  const values = { ...registry.values, ...CoreValueMap };
   return {
     values,
-    nodes: getCoreNodeDefinitions(getCoreValueTypes())
+    nodes: { ...registry.nodes, ...getCoreDefinitionMap(values) }
   };
 };

packages/flow/src/hooks/useCoreRegistry.ts

@@ -1,14 +1,14 @@
 import {
   getCoreNodeDefinitions,
-  getCoreValueTypes,
+  getCoreValueMap,
   ValueTypeMap
 } from '@behave-graph/core';
 import { useMemo } from 'react';
 
 import { useCoreDependencies } from './useDependencies.js';
 
 export const useCoreValueDefinitions = () => {
-  return useMemo(() => getCoreValueTypes(), []);
+  return useMemo(() => getCoreValueMap(), []);
 };
 
 export const useCoreNodeDefinitions = ({

packages/flow/src/hooks/useDependencies.ts

@@ -9,7 +9,7 @@ import { useEffect, useState } from 'react';
 export const useCoreDependencies = () => {
   const [dependencies] = useState(() =>
     makeCoreDependencies({
-      lifecyleEmitter: new ManualLifecycleEventEmitter(),
+      lifecycleEmitter: new ManualLifecycleEventEmitter(),
       logger: new DefaultLogger()
     })
   );

packages/flow/src/hooks/useRegistry.ts

@@ -1,7 +1,7 @@
 import {
   DefaultLogger,
   getCoreNodeDefinitions,
-  getCoreValueTypes,
+  getCoreValueMap,
   IRegistry,
   ManualLifecycleEventEmitter
 } from '@behave-graph/core';
@@ -10,7 +10,7 @@ import { useState } from 'react';
 const createRegistry = () => {
   const manualLifecycleEventEmitter = new ManualLifecycleEventEmitter();
   const logger = new DefaultLogger();
-  const valueTypeMap = getCoreValueTypes();
+  const valueTypeMap = getCoreValueMap();
   const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
 
   return {

packages/flow/src/util/getNodeSpecJSON.ts

@@ -1,7 +1,7 @@
 import {
   DefaultLogger,
   getCoreNodeDefinitions,
-  getCoreValueTypes,
+  getCoreValueMap,
   ManualLifecycleEventEmitter,
   NodeSpecJSON,
   writeNodeSpecsToJSON
@@ -13,7 +13,7 @@ export const getNodeSpecJSON = (): NodeSpecJSON[] => {
   if (nodeSpecJSON === undefined) {
     const lifecycleEventEmitter = new ManualLifecycleEventEmitter();
     const logger = new DefaultLogger();
-    const valueTypeMap = getCoreValueTypes();
+    const valueTypeMap = getCoreValueMap();
     const nodeDefinitionMap = getCoreNodeDefinitions(valueTypeMap);
     nodeSpecJSON = writeNodeSpecsToJSON({
       nodes: nodeDefinitionMap,