@highstate/backend 0.9.4 → 0.9.6

package/dist/library/worker/main.js

@@ -29,21 +29,24 @@ async function loadLibrary(jiti2, logger2, modulePaths) {
   const modules = {};
   for (const modulePath of modulePaths) {
     try {
-      logger2.debug("loading module", { modulePath });
+      logger2.debug({ modulePath }, "loading module");
       modules[modulePath] = await jiti2.import(modulePath);
-      logger2.debug("module loaded", { modulePath });
-    } catch (error) {
-      logger2.error("module load failed", { modulePath, error });
+      logger2.debug({ modulePath }, "module loaded");
+    } catch (err) {
+      logger2.error({ modulePath, err }, "module load failed");
     }
   }
   const components = {};
   const entities = {};
   await _loadLibrary(modules, components, entities);
-  logger2.info("library loaded", {
-    componentCount: Object.keys(components).length,
-    entityCount: Object.keys(entities).length
-  });
-  logger2.trace("library content", { components, entities });
+  logger2.info(
+    {
+      componentCount: Object.keys(components).length,
+      entityCount: Object.keys(entities).length
+    },
+    "library loaded"
+  );
+  logger2.trace({ components, entities }, "library content");
   return { components, entities };
 }
 async function _loadLibrary(value, components, entities) {
@@ -109,11 +112,12 @@ function evaluateModules(jiti2, logger2, modulePaths) {
 function evaluateInstances(logger2, library2, allInstances, resolvedInputs, instanceIds) {
   const results = [];
   const allInstancesMap = new Map(allInstances.map((instance) => [instance.id, instance]));
-  const instanceOutputs = /* @__PURE__ */ new Map();
   for (const instanceId of instanceIds ?? []) {
+    const externalInstanceIds = new Set(allInstances.map((instance) => instance.id));
+    externalInstanceIds.delete(instanceId);
     try {
       logger2.debug({ instanceId }, "evaluating top-level instance");
-      resetEvaluation();
+      resetEvaluation(externalInstanceIds);
       evaluateInstance(instanceId);
       results.push({
         success: true,
@@ -129,15 +133,15 @@ function evaluateInstances(logger2, library2, allInstances, resolvedInputs, inst
     }
   }
   return results;
-  function evaluateInstance(instanceId) {
+  function evaluateInstance(instanceId, instanceOutputs = /* @__PURE__ */ new Map()) {
     let outputs = instanceOutputs.get(instanceId);
     if (!outputs) {
-      outputs = _evaluateInstance(instanceId);
+      outputs = _evaluateInstance(instanceId, instanceOutputs);
       instanceOutputs.set(instanceId, outputs);
     }
     return outputs;
   }
-  function _evaluateInstance(instanceId) {
+  function _evaluateInstance(instanceId, instanceOutputs) {
     const inputs = {};
     const instance = allInstancesMap.get(instanceId);
     logger2.info("evaluating instance", { instanceId });
@@ -146,7 +150,7 @@ function evaluateInstances(logger2, library2, allInstances, resolvedInputs, inst
     }
     for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {
       inputs[inputName] = input.map((input2) => {
-        const evaluated = evaluateInstance(input2.input.instanceId);
+        const evaluated = evaluateInstance(input2.input.instanceId, instanceOutputs);
         return evaluated[input2.input.output];
       });
     }

package/dist/library/worker/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/library/worker/main.ts","../../../src/library/worker/loader.ts","../../../src/library/worker/evaluator.ts"],"sourcesContent":["import type { WorkerData, WorkerRequest, WorkerResponse } from \"./protocol\"\nimport { parentPort, workerData } from \"node:worker_threads\"\nimport { createJiti, type Jiti } from \"jiti\"\nimport { pino } from \"pino\"\nimport { mapValues } from \"remeda\"\nimport { errorToString } from \"../../common\"\nimport { loadLibrary, type Library } from \"./loader\"\nimport { evaluateInstances, evaluateModules } from \"./evaluator\"\n\nconst data = workerData as WorkerData\n\nconst logger = pino({ name: \"library-worker\", level: data.logLevel })\nlet jiti: Jiti\nlet library: Library\n\ntry {\n  logger.info(\"worker started\")\n  logger.trace({ data }, \"worker data\")\n\n  jiti = createJiti(import.meta.filename)\n  logger.debug({ filename: import.meta.filename }, \"jiti created\")\n\n  library = await loadLibrary(jiti, logger, data.modulePaths)\n\n  parentPort!.postMessage({\n    type: \"library\",\n    library: {\n      components: mapValues(library.components, component => component.model),\n      entities: library.entities,\n    },\n  } satisfies WorkerResponse)\n\n  logger.info(\"library loaded and sent\")\n} catch (error) {\n  logger.error({ error }, \"failed to load library\")\n\n  parentPort!.postMessage({\n    type: \"error\",\n    error: errorToString(error),\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-misused-promises\nparentPort!.on(\"message\", async message => {\n  try {\n    const request = message as WorkerRequest\n\n    switch (request.type) {\n      case \"evaluate-composite-instances\": {\n        const results = evaluateInstances(\n          logger,\n          library,\n          request.allInstances,\n          request.resolvedInputs,\n          request.instanceIds,\n        )\n\n        parentPort!.postMessage({\n          type: \"instance-evaluation-results\",\n          results,\n        } satisfies WorkerResponse)\n        break\n      }\n      case \"evaluate-modules\": {\n        const result = await evaluateModules(jiti, logger, request.modulePaths)\n\n        parentPort!.postMessage({\n          type: \"module-evaluation-result\",\n          result,\n        } satisfies WorkerResponse)\n        break\n      }\n    }\n  } catch (error) {\n    logger.error({ error }, \"failed to evaluate\")\n\n    parentPort!.postMessage({\n      type: \"error\",\n      error: errorToString(error),\n    } satisfies WorkerResponse)\n  }\n})\n","import type { Logger } from \"pino\"\nimport type { Jiti } from \"jiti\"\nimport Module from \"node:module\"\nimport {\n  type Component,\n  type Entity,\n  isComponent,\n  isEntity,\n  isUnitModel,\n  originalCreate,\n} from \"@highstate/contract\"\nimport { serializeFunction } from \"@pulumi/pulumi/runtime/index.js\"\nimport { sha256 } from \"crypto-hash\"\n\ndeclare module \"module\" {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Module {\n    function _load(request: unknown, parent: unknown, isMain: boolean): unknown\n  }\n}\n\nconst originalLoad = Module._load\n\nModule._load = function (request: unknown, parent: unknown, isMain: boolean) {\n  if (request === \"trace_events\") {\n    return {}\n  }\n\n  return originalLoad(request, parent, isMain)\n}\n\nexport type Library = Readonly<{\n  components: Readonly<Record<string, Component>>\n  entities: Readonly<Record<string, Entity>>\n}>\n\nexport async function loadLibrary(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<Library> {\n  const modules: Record<string, unknown> = {}\n  for (const modulePath of modulePaths) {\n    try {\n      logger.debug(\"loading module\", { modulePath })\n      modules[modulePath] = await jiti.import(modulePath)\n\n      logger.debug(\"module loaded\", { modulePath })\n    } catch (error) {\n      logger.error(\"module load failed\", { modulePath, error })\n    }\n  }\n\n  const components: Record<string, Component> = {}\n  const entities: Record<string, Entity> = {}\n\n  await _loadLibrary(modules, components, entities)\n\n  logger.info(\"library loaded\", {\n    componentCount: Object.keys(components).length,\n    entityCount: Object.keys(entities).length,\n  })\n\n  logger.trace(\"library content\", { components, entities })\n\n  return { components, entities }\n}\n\nasync function _loadLibrary(\n  value: unknown,\n  components: Record<string, Component>,\n  entities: Record<string, Entity>,\n): Promise<void> {\n  if (isComponent(value)) {\n    components[value.model.type] = value\n    value.model.definitionHash = await calculateComponentDefinitionHash(value)\n\n    for (const entity of value.entities.values()) {\n      entity.definitionHash ??= await calculateEntityDefinitionHash(entity)\n    }\n    return\n  }\n\n  if (isEntity(value)) {\n    entities[value.type] = value\n    entities[value.type].definitionHash ??= await calculateEntityDefinitionHash(value)\n    return\n  }\n\n  if (typeof value !== \"object\" || value === null) {\n    return\n  }\n\n  for (const key in value) {\n    await _loadLibrary((value as Record<string, unknown>)[key], components, entities)\n  }\n}\n\nasync function calculateComponentDefinitionHash(component: Component): Promise<string> {\n  if (isUnitModel(component.model)) {\n    return await sha256(JSON.stringify(component.model))\n  }\n\n  const serializedCreate = await serializeFunction(component[originalCreate])\n\n  return await sha256(JSON.stringify(component.model) + serializedCreate.text)\n}\n\nasync function calculateEntityDefinitionHash(entity: Entity): Promise<string> {\n  return await sha256(JSON.stringify(entity))\n}\n","import type { Logger } from \"pino\"\nimport type { Library } from \"./loader\"\nimport type { Jiti } from \"jiti\"\nimport type { InstanceEvaluationResult, ModuleEvaluationResult } from \"../abstractions\"\nimport type { ResolvedInstanceInput } from \"../../shared\"\nimport { getCompositeInstances, resetEvaluation, type InstanceModel } from \"@highstate/contract\"\nimport { BetterLock } from \"better-lock\"\nimport { errorToString } from \"../../common\"\n\nconst lock = new BetterLock()\n\nexport function evaluateModules(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<ModuleEvaluationResult> {\n  return lock.acquire(async () => {\n    resetEvaluation()\n    let lastModulePath = \"\"\n\n    try {\n      for (const modulePath of modulePaths) {\n        logger.info(\"loading module: %s\", modulePath)\n\n        lastModulePath = modulePath\n        await jiti.import(modulePath)\n\n        logger.debug(\"module loaded: %s\", modulePath)\n      }\n\n      return {\n        success: true,\n        compositeInstances: getCompositeInstances(),\n      }\n    } catch (error) {\n      return {\n        success: false,\n        modulePath: lastModulePath,\n        error: errorToString(error),\n      }\n    }\n  })\n}\n\nexport function evaluateInstances(\n  logger: Logger,\n  library: Library,\n  allInstances: InstanceModel[],\n  resolvedInputs: Record<string, Record<string, ResolvedInstanceInput[]>>,\n  instanceIds: string[],\n): InstanceEvaluationResult[] {\n  const results: InstanceEvaluationResult[] = []\n  const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))\n  const instanceOutputs = new Map<string, Record<string, unknown>>()\n\n  for (const instanceId of instanceIds ?? []) {\n    try {\n      logger.debug({ instanceId }, \"evaluating top-level instance\")\n      resetEvaluation()\n\n      evaluateInstance(instanceId)\n\n      results.push({\n        success: true,\n        instanceId,\n        compositeInstances: getCompositeInstances(),\n      })\n    } catch (error) {\n      results.push({\n        success: false,\n        instanceId,\n        error: errorToString(error),\n      })\n    }\n  }\n\n  return results\n\n  function evaluateInstance(instanceId: string): Record<string, unknown> {\n    let outputs = instanceOutputs.get(instanceId)\n\n    if (!outputs) {\n      outputs = _evaluateInstance(instanceId)\n      instanceOutputs.set(instanceId, outputs)\n    }\n\n    return outputs\n  }\n\n  function _evaluateInstance(instanceId: string): Record<string, unknown> {\n    const inputs: Record<string, unknown> = {}\n    const instance = allInstancesMap.get(instanceId)\n\n    logger.info(\"evaluating instance\", { instanceId })\n\n    if (!instance) {\n      throw new Error(`Instance not found: ${instanceId}`)\n    }\n\n    for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {\n      inputs[inputName] = input.map(input => {\n        const evaluated = evaluateInstance(input.input.instanceId)\n\n        return evaluated[input.input.output]\n      })\n    }\n\n    const component = library.components[instance.type]\n    if (!component) {\n      throw new Error(`Component not found: ${instance.type}, required by instance: ${instanceId}`)\n    }\n\n    return component({\n      name: instance.name,\n      args: instance.args as Record<string, never>,\n      inputs: inputs as Record<string, never>,\n    })\n  }\n}\n"],"mappings":"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","names":["jiti","logger","jiti","logger","library","input"]}
+{"version":3,"sources":["../../../src/library/worker/main.ts","../../../src/library/worker/loader.ts","../../../src/library/worker/evaluator.ts"],"sourcesContent":["import type { WorkerData, WorkerRequest, WorkerResponse } from \"./protocol\"\nimport { parentPort, workerData } from \"node:worker_threads\"\nimport { createJiti, type Jiti } from \"jiti\"\nimport { pino } from \"pino\"\nimport { mapValues } from \"remeda\"\nimport { errorToString } from \"../../common\"\nimport { loadLibrary, type Library } from \"./loader\"\nimport { evaluateInstances, evaluateModules } from \"./evaluator\"\n\nconst data = workerData as WorkerData\n\nconst logger = pino({ name: \"library-worker\", level: data.logLevel })\nlet jiti: Jiti\nlet library: Library\n\ntry {\n  logger.info(\"worker started\")\n  logger.trace({ data }, \"worker data\")\n\n  jiti = createJiti(import.meta.filename)\n  logger.debug({ filename: import.meta.filename }, \"jiti created\")\n\n  library = await loadLibrary(jiti, logger, data.modulePaths)\n\n  parentPort!.postMessage({\n    type: \"library\",\n    library: {\n      components: mapValues(library.components, component => component.model),\n      entities: library.entities,\n    },\n  } satisfies WorkerResponse)\n\n  logger.info(\"library loaded and sent\")\n} catch (error) {\n  logger.error({ error }, \"failed to load library\")\n\n  parentPort!.postMessage({\n    type: \"error\",\n    error: errorToString(error),\n  })\n}\n\n// eslint-disable-next-line @typescript-eslint/no-misused-promises\nparentPort!.on(\"message\", async message => {\n  try {\n    const request = message as WorkerRequest\n\n    switch (request.type) {\n      case \"evaluate-composite-instances\": {\n        const results = evaluateInstances(\n          logger,\n          library,\n          request.allInstances,\n          request.resolvedInputs,\n          request.instanceIds,\n        )\n\n        parentPort!.postMessage({\n          type: \"instance-evaluation-results\",\n          results,\n        } satisfies WorkerResponse)\n        break\n      }\n      case \"evaluate-modules\": {\n        const result = await evaluateModules(jiti, logger, request.modulePaths)\n\n        parentPort!.postMessage({\n          type: \"module-evaluation-result\",\n          result,\n        } satisfies WorkerResponse)\n        break\n      }\n    }\n  } catch (error) {\n    logger.error({ error }, \"failed to evaluate\")\n\n    parentPort!.postMessage({\n      type: \"error\",\n      error: errorToString(error),\n    } satisfies WorkerResponse)\n  }\n})\n","import type { Logger } from \"pino\"\nimport type { Jiti } from \"jiti\"\nimport Module from \"node:module\"\nimport {\n  type Component,\n  type Entity,\n  isComponent,\n  isEntity,\n  isUnitModel,\n  originalCreate,\n} from \"@highstate/contract\"\nimport { serializeFunction } from \"@pulumi/pulumi/runtime/index.js\"\nimport { sha256 } from \"crypto-hash\"\n\ndeclare module \"module\" {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace Module {\n    function _load(request: unknown, parent: unknown, isMain: boolean): unknown\n  }\n}\n\nconst originalLoad = Module._load\n\nModule._load = function (request: unknown, parent: unknown, isMain: boolean) {\n  if (request === \"trace_events\") {\n    return {}\n  }\n\n  return originalLoad(request, parent, isMain)\n}\n\nexport type Library = Readonly<{\n  components: Readonly<Record<string, Component>>\n  entities: Readonly<Record<string, Entity>>\n}>\n\nexport async function loadLibrary(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<Library> {\n  const modules: Record<string, unknown> = {}\n  for (const modulePath of modulePaths) {\n    try {\n      logger.debug({ modulePath }, \"loading module\")\n      modules[modulePath] = await jiti.import(modulePath)\n\n      logger.debug({ modulePath }, \"module loaded\")\n    } catch (err) {\n      logger.error({ modulePath, err }, \"module load failed\")\n    }\n  }\n\n  const components: Record<string, Component> = {}\n  const entities: Record<string, Entity> = {}\n\n  await _loadLibrary(modules, components, entities)\n\n  logger.info(\n    {\n      componentCount: Object.keys(components).length,\n      entityCount: Object.keys(entities).length,\n    },\n    \"library loaded\",\n  )\n\n  logger.trace({ components, entities }, \"library content\")\n\n  return { components, entities }\n}\n\nasync function _loadLibrary(\n  value: unknown,\n  components: Record<string, Component>,\n  entities: Record<string, Entity>,\n): Promise<void> {\n  if (isComponent(value)) {\n    components[value.model.type] = value\n    value.model.definitionHash = await calculateComponentDefinitionHash(value)\n\n    for (const entity of value.entities.values()) {\n      entity.definitionHash ??= await calculateEntityDefinitionHash(entity)\n    }\n    return\n  }\n\n  if (isEntity(value)) {\n    entities[value.type] = value\n    entities[value.type].definitionHash ??= await calculateEntityDefinitionHash(value)\n    return\n  }\n\n  if (typeof value !== \"object\" || value === null) {\n    return\n  }\n\n  for (const key in value) {\n    await _loadLibrary((value as Record<string, unknown>)[key], components, entities)\n  }\n}\n\nasync function calculateComponentDefinitionHash(component: Component): Promise<string> {\n  if (isUnitModel(component.model)) {\n    return await sha256(JSON.stringify(component.model))\n  }\n\n  const serializedCreate = await serializeFunction(component[originalCreate])\n\n  return await sha256(JSON.stringify(component.model) + serializedCreate.text)\n}\n\nasync function calculateEntityDefinitionHash(entity: Entity): Promise<string> {\n  return await sha256(JSON.stringify(entity))\n}\n","import type { Logger } from \"pino\"\nimport type { Library } from \"./loader\"\nimport type { Jiti } from \"jiti\"\nimport type { InstanceEvaluationResult, ModuleEvaluationResult } from \"../abstractions\"\nimport type { ResolvedInstanceInput } from \"../../shared\"\nimport { getCompositeInstances, resetEvaluation, type InstanceModel } from \"@highstate/contract\"\nimport { BetterLock } from \"better-lock\"\nimport { errorToString } from \"../../common\"\n\nconst lock = new BetterLock()\n\nexport function evaluateModules(\n  jiti: Jiti,\n  logger: Logger,\n  modulePaths: string[],\n): Promise<ModuleEvaluationResult> {\n  return lock.acquire(async () => {\n    resetEvaluation()\n    let lastModulePath = \"\"\n\n    try {\n      for (const modulePath of modulePaths) {\n        logger.info(\"loading module: %s\", modulePath)\n\n        lastModulePath = modulePath\n        await jiti.import(modulePath)\n\n        logger.debug(\"module loaded: %s\", modulePath)\n      }\n\n      return {\n        success: true,\n        compositeInstances: getCompositeInstances(),\n      }\n    } catch (error) {\n      return {\n        success: false,\n        modulePath: lastModulePath,\n        error: errorToString(error),\n      }\n    }\n  })\n}\n\nexport function evaluateInstances(\n  logger: Logger,\n  library: Library,\n  allInstances: InstanceModel[],\n  resolvedInputs: Record<string, Record<string, ResolvedInstanceInput[]>>,\n  instanceIds: string[],\n): InstanceEvaluationResult[] {\n  const results: InstanceEvaluationResult[] = []\n  const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))\n\n  for (const instanceId of instanceIds ?? []) {\n    const externalInstanceIds = new Set(allInstances.map(instance => instance.id))\n    externalInstanceIds.delete(instanceId)\n\n    try {\n      logger.debug({ instanceId }, \"evaluating top-level instance\")\n      resetEvaluation(externalInstanceIds)\n\n      evaluateInstance(instanceId)\n\n      results.push({\n        success: true,\n        instanceId,\n        compositeInstances: getCompositeInstances(),\n      })\n    } catch (error) {\n      results.push({\n        success: false,\n        instanceId,\n        error: errorToString(error),\n      })\n    }\n  }\n\n  return results\n\n  function evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>> = new Map(),\n  ): Record<string, unknown> {\n    let outputs = instanceOutputs.get(instanceId)\n\n    if (!outputs) {\n      outputs = _evaluateInstance(instanceId, instanceOutputs)\n      instanceOutputs.set(instanceId, outputs)\n    }\n\n    return outputs\n  }\n\n  function _evaluateInstance(\n    instanceId: string,\n    instanceOutputs: Map<string, Record<string, unknown>>,\n  ): Record<string, unknown> {\n    const inputs: Record<string, unknown> = {}\n    const instance = allInstancesMap.get(instanceId)\n\n    logger.info(\"evaluating instance\", { instanceId })\n\n    if (!instance) {\n      throw new Error(`Instance not found: ${instanceId}`)\n    }\n\n    for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {\n      inputs[inputName] = input.map(input => {\n        const evaluated = evaluateInstance(input.input.instanceId, instanceOutputs)\n\n        return evaluated[input.input.output]\n      })\n    }\n\n    const component = library.components[instance.type]\n    if (!component) {\n      throw new Error(`Component not found: ${instance.type}, required by instance: ${instanceId}`)\n    }\n\n    return component({\n      name: instance.name,\n      args: instance.args as Record<string, never>,\n      inputs: inputs as Record<string, never>,\n    })\n  }\n}\n"],"mappings":";;;;;AACA,SAAS,YAAY,kBAAkB;AACvC,SAAS,kBAA6B;AACtC,SAAS,YAAY;AACrB,SAAS,iBAAiB;;;ACF1B,OAAO,YAAY;AACnB;AAAA,EAGE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,yBAAyB;AAClC,SAAS,cAAc;AASvB,IAAM,eAAe,OAAO;AAE5B,OAAO,QAAQ,SAAU,SAAkB,QAAiB,QAAiB;AAC3E,MAAI,YAAY,gBAAgB;AAC9B,WAAO,CAAC;AAAA,EACV;AAEA,SAAO,aAAa,SAAS,QAAQ,MAAM;AAC7C;AAOA,eAAsB,YACpBA,OACAC,SACA,aACkB;AAClB,QAAM,UAAmC,CAAC;AAC1C,aAAW,cAAc,aAAa;AACpC,QAAI;AACF,MAAAA,QAAO,MAAM,EAAE,WAAW,GAAG,gBAAgB;AAC7C,cAAQ,UAAU,IAAI,MAAMD,MAAK,OAAO,UAAU;AAElD,MAAAC,QAAO,MAAM,EAAE,WAAW,GAAG,eAAe;AAAA,IAC9C,SAAS,KAAK;AACZ,MAAAA,QAAO,MAAM,EAAE,YAAY,IAAI,GAAG,oBAAoB;AAAA,IACxD;AAAA,EACF;AAEA,QAAM,aAAwC,CAAC;AAC/C,QAAM,WAAmC,CAAC;AAE1C,QAAM,aAAa,SAAS,YAAY,QAAQ;AAEhD,EAAAA,QAAO;AAAA,IACL;AAAA,MACE,gBAAgB,OAAO,KAAK,UAAU,EAAE;AAAA,MACxC,aAAa,OAAO,KAAK,QAAQ,EAAE;AAAA,IACrC;AAAA,IACA;AAAA,EACF;AAEA,EAAAA,QAAO,MAAM,EAAE,YAAY,SAAS,GAAG,iBAAiB;AAExD,SAAO,EAAE,YAAY,SAAS;AAChC;AAEA,eAAe,aACb,OACA,YACA,UACe;AACf,MAAI,YAAY,KAAK,GAAG;AACtB,eAAW,MAAM,MAAM,IAAI,IAAI;AAC/B,UAAM,MAAM,iBAAiB,MAAM,iCAAiC,KAAK;AAEzE,eAAW,UAAU,MAAM,SAAS,OAAO,GAAG;AAC5C,aAAO,mBAAmB,MAAM,8BAA8B,MAAM;AAAA,IACtE;AACA;AAAA,EACF;AAEA,MAAI,SAAS,KAAK,GAAG;AACnB,aAAS,MAAM,IAAI,IAAI;AACvB,aAAS,MAAM,IAAI,EAAE,mBAAmB,MAAM,8BAA8B,KAAK;AACjF;AAAA,EACF;AAEA,MAAI,OAAO,UAAU,YAAY,UAAU,MAAM;AAC/C;AAAA,EACF;AAEA,aAAW,OAAO,OAAO;AACvB,UAAM,aAAc,MAAkC,GAAG,GAAG,YAAY,QAAQ;AAAA,EAClF;AACF;AAEA,eAAe,iCAAiC,WAAuC;AACrF,MAAI,YAAY,UAAU,KAAK,GAAG;AAChC,WAAO,MAAM,OAAO,KAAK,UAAU,UAAU,KAAK,CAAC;AAAA,EACrD;AAEA,QAAM,mBAAmB,MAAM,kBAAkB,UAAU,cAAc,CAAC;AAE1E,SAAO,MAAM,OAAO,KAAK,UAAU,UAAU,KAAK,IAAI,iBAAiB,IAAI;AAC7E;AAEA,eAAe,8BAA8B,QAAiC;AAC5E,SAAO,MAAM,OAAO,KAAK,UAAU,MAAM,CAAC;AAC5C;;;AC5GA,SAAS,uBAAuB,uBAA2C;AAC3E,SAAS,kBAAkB;AAG3B,IAAM,OAAO,IAAI,WAAW;AAErB,SAAS,gBACdC,OACAC,SACA,aACiC;AACjC,SAAO,KAAK,QAAQ,YAAY;AAC9B,oBAAgB;AAChB,QAAI,iBAAiB;AAErB,QAAI;AACF,iBAAW,cAAc,aAAa;AACpC,QAAAA,QAAO,KAAK,sBAAsB,UAAU;AAE5C,yBAAiB;AACjB,cAAMD,MAAK,OAAO,UAAU;AAE5B,QAAAC,QAAO,MAAM,qBAAqB,UAAU;AAAA,MAC9C;AAEA,aAAO;AAAA,QACL,SAAS;AAAA,QACT,oBAAoB,sBAAsB;AAAA,MAC5C;AAAA,IACF,SAAS,OAAO;AACd,aAAO;AAAA,QACL,SAAS;AAAA,QACT,YAAY;AAAA,QACZ,OAAO,cAAc,KAAK;AAAA,MAC5B;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEO,SAAS,kBACdA,SACAC,UACA,cACA,gBACA,aAC4B;AAC5B,QAAM,UAAsC,CAAC;AAC7C,QAAM,kBAAkB,IAAI,IAAI,aAAa,IAAI,cAAY,CAAC,SAAS,IAAI,QAAQ,CAAC,CAAC;AAErF,aAAW,cAAc,eAAe,CAAC,GAAG;AAC1C,UAAM,sBAAsB,IAAI,IAAI,aAAa,IAAI,cAAY,SAAS,EAAE,CAAC;AAC7E,wBAAoB,OAAO,UAAU;AAErC,QAAI;AACF,MAAAD,QAAO,MAAM,EAAE,WAAW,GAAG,+BAA+B;AAC5D,sBAAgB,mBAAmB;AAEnC,uBAAiB,UAAU;AAE3B,cAAQ,KAAK;AAAA,QACX,SAAS;AAAA,QACT;AAAA,QACA,oBAAoB,sBAAsB;AAAA,MAC5C,CAAC;AAAA,IACH,SAAS,OAAO;AACd,cAAQ,KAAK;AAAA,QACX,SAAS;AAAA,QACT;AAAA,QACA,OAAO,cAAc,KAAK;AAAA,MAC5B,CAAC;AAAA,IACH;AAAA,EACF;AAEA,SAAO;AAEP,WAAS,iBACP,YACA,kBAAwD,oBAAI,IAAI,GACvC;AACzB,QAAI,UAAU,gBAAgB,IAAI,UAAU;AAE5C,QAAI,CAAC,SAAS;AACZ,gBAAU,kBAAkB,YAAY,eAAe;AACvD,sBAAgB,IAAI,YAAY,OAAO;AAAA,IACzC;AAEA,WAAO;AAAA,EACT;AAEA,WAAS,kBACP,YACA,iBACyB;AACzB,UAAM,SAAkC,CAAC;AACzC,UAAM,WAAW,gBAAgB,IAAI,UAAU;AAE/C,IAAAA,QAAO,KAAK,uBAAuB,EAAE,WAAW,CAAC;AAEjD,QAAI,CAAC,UAAU;AACb,YAAM,IAAI,MAAM,uBAAuB,UAAU,EAAE;AAAA,IACrD;AAEA,eAAW,CAAC,WAAW,KAAK,KAAK,OAAO,QAAQ,eAAe,UAAU,KAAK,CAAC,CAAC,GAAG;AACjF,aAAO,SAAS,IAAI,MAAM,IAAI,CAAAE,WAAS;AACrC,cAAM,YAAY,iBAAiBA,OAAM,MAAM,YAAY,eAAe;AAE1E,eAAO,UAAUA,OAAM,MAAM,MAAM;AAAA,MACrC,CAAC;AAAA,IACH;AAEA,UAAM,YAAYD,SAAQ,WAAW,SAAS,IAAI;AAClD,QAAI,CAAC,WAAW;AACd,YAAM,IAAI,MAAM,wBAAwB,SAAS,IAAI,2BAA2B,UAAU,EAAE;AAAA,IAC9F;AAEA,WAAO,UAAU;AAAA,MACf,MAAM,SAAS;AAAA,MACf,MAAM,SAAS;AAAA,MACf;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;AFrHA,IAAM,OAAO;AAEb,IAAM,SAAS,KAAK,EAAE,MAAM,kBAAkB,OAAO,KAAK,SAAS,CAAC;AACpE,IAAI;AACJ,IAAI;AAEJ,IAAI;AACF,SAAO,KAAK,gBAAgB;AAC5B,SAAO,MAAM,EAAE,KAAK,GAAG,aAAa;AAEpC,SAAO,WAAW,YAAY,QAAQ;AACtC,SAAO,MAAM,EAAE,UAAU,YAAY,SAAS,GAAG,cAAc;AAE/D,YAAU,MAAM,YAAY,MAAM,QAAQ,KAAK,WAAW;AAE1D,aAAY,YAAY;AAAA,IACtB,MAAM;AAAA,IACN,SAAS;AAAA,MACP,YAAY,UAAU,QAAQ,YAAY,eAAa,UAAU,KAAK;AAAA,MACtE,UAAU,QAAQ;AAAA,IACpB;AAAA,EACF,CAA0B;AAE1B,SAAO,KAAK,yBAAyB;AACvC,SAAS,OAAO;AACd,SAAO,MAAM,EAAE,MAAM,GAAG,wBAAwB;AAEhD,aAAY,YAAY;AAAA,IACtB,MAAM;AAAA,IACN,OAAO,cAAc,KAAK;AAAA,EAC5B,CAAC;AACH;AAGA,WAAY,GAAG,WAAW,OAAM,YAAW;AACzC,MAAI;AACF,UAAM,UAAU;AAEhB,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK,gCAAgC;AACnC,cAAM,UAAU;AAAA,UACd;AAAA,UACA;AAAA,UACA,QAAQ;AAAA,UACR,QAAQ;AAAA,UACR,QAAQ;AAAA,QACV;AAEA,mBAAY,YAAY;AAAA,UACtB,MAAM;AAAA,UACN;AAAA,QACF,CAA0B;AAC1B;AAAA,MACF;AAAA,MACA,KAAK,oBAAoB;AACvB,cAAM,SAAS,MAAM,gBAAgB,MAAM,QAAQ,QAAQ,WAAW;AAEtE,mBAAY,YAAY;AAAA,UACtB,MAAM;AAAA,UACN;AAAA,QACF,CAA0B;AAC1B;AAAA,MACF;AAAA,IACF;AAAA,EACF,SAAS,OAAO;AACd,WAAO,MAAM,EAAE,MAAM,GAAG,oBAAoB;AAE5C,eAAY,YAAY;AAAA,MACtB,MAAM;AAAA,MACN,OAAO,cAAc,KAAK;AAAA,IAC5B,CAA0B;AAAA,EAC5B;AACF,CAAC;","names":["jiti","logger","jiti","logger","library","input"]}

package/dist/shared/index.js

@@ -31,6 +31,7 @@ import {
   instanceStateSchema,
   instanceStateUpdateSchema,
   instanceStatusFieldSchema,
+  instanceStatusFieldValueSchema,
   instanceStatusSchema,
   instanceTerminalFileSchema,
   instanceTerminalMetaSchema,
@@ -47,7 +48,7 @@ import {
   projectOperationSchema,
   resolverFactories,
   terminalSessionSchema
-} from "../chunk-I7NLZ54E.js";
+} from "../chunk-NMGIUI6X.js";
 export {
   CircularDependencyError,
   applyLibraryUpdate,
@@ -81,6 +82,7 @@ export {
   instanceStateSchema,
   instanceStateUpdateSchema,
   instanceStatusFieldSchema,
+  instanceStatusFieldValueSchema,
   instanceStatusSchema,
   instanceTerminalFileSchema,
   instanceTerminalMetaSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/backend",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "type": "module",
   "files": [
     "dist",
@@ -26,7 +26,7 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/contract": "^0.9.4",
+    "@highstate/contract": "^0.9.6",
     "@types/node": "^22.10.1",
     "ajv": "^8.17.1",
     "better-lock": "^3.2.0",
@@ -65,5 +65,5 @@
     "rollup": "^4.28.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "021af8cde467823881e2dc82ccb606c9617772ea"
+  "gitHead": "3c7e8883ef6cbc3e3f7c2c5529115767aae5c96a"
 }

package/src/library/local.ts

@@ -110,7 +110,11 @@ export class LocalLibraryBackend implements LibraryBackend {
     return await this.lock.acquire(async () => {
       const [library] = await this.getLibrary()
 
-      const units = unitTypes.map(type => library.components[type]).filter(isUnitModel)
+      const units = unitTypes
+        .map(type => library.components[type])
+        .filter(Boolean)
+        .filter(isUnitModel)
+
       const packageNames = Object.keys(groupBy(units, unit => unit.source.package))
 
       await this.ensureLibraryPackagesLoaded(packageNames, true)
@@ -213,11 +217,13 @@ export class LocalLibraryBackend implements LibraryBackend {
   private async reloadLibrary(): Promise<[LibraryModel, Worker]> {
     this.logger.info("reloading library")
 
+    this.eventEmitter.emit("library", [{ type: "reload-started" }])
+
     await this.ensureLibraryPackagesLoaded(this.libraryPackages, true)
 
     this.worker = this.createLibraryWorker({
       modulePaths: this.libraryPackages,
-      logLevel: "silent",
+      logLevel: "warn",
     })
 
     for await (const [event] of on(this.worker, "message")) {
@@ -245,6 +251,8 @@ export class LocalLibraryBackend implements LibraryBackend {
 
       this.logger.info("library reloaded")
 
+      this.eventEmitter.emit("library", [{ type: "reload-completed" }])
+
       return [this.library, this.worker]
     }
 

package/src/library/worker/evaluator.ts

@@ -51,12 +51,14 @@ export function evaluateInstances(
 ): InstanceEvaluationResult[] {
   const results: InstanceEvaluationResult[] = []
   const allInstancesMap = new Map(allInstances.map(instance => [instance.id, instance]))
-  const instanceOutputs = new Map<string, Record<string, unknown>>()
 
   for (const instanceId of instanceIds ?? []) {
+    const externalInstanceIds = new Set(allInstances.map(instance => instance.id))
+    externalInstanceIds.delete(instanceId)
+
     try {
       logger.debug({ instanceId }, "evaluating top-level instance")
-      resetEvaluation()
+      resetEvaluation(externalInstanceIds)
 
       evaluateInstance(instanceId)
 
@@ -76,18 +78,24 @@ export function evaluateInstances(
 
   return results
 
-  function evaluateInstance(instanceId: string): Record<string, unknown> {
+  function evaluateInstance(
+    instanceId: string,
+    instanceOutputs: Map<string, Record<string, unknown>> = new Map(),
+  ): Record<string, unknown> {
     let outputs = instanceOutputs.get(instanceId)
 
     if (!outputs) {
-      outputs = _evaluateInstance(instanceId)
+      outputs = _evaluateInstance(instanceId, instanceOutputs)
       instanceOutputs.set(instanceId, outputs)
     }
 
     return outputs
   }
 
-  function _evaluateInstance(instanceId: string): Record<string, unknown> {
+  function _evaluateInstance(
+    instanceId: string,
+    instanceOutputs: Map<string, Record<string, unknown>>,
+  ): Record<string, unknown> {
     const inputs: Record<string, unknown> = {}
     const instance = allInstancesMap.get(instanceId)
 
@@ -99,7 +107,7 @@ export function evaluateInstances(
 
     for (const [inputName, input] of Object.entries(resolvedInputs[instanceId] ?? {})) {
       inputs[inputName] = input.map(input => {
-        const evaluated = evaluateInstance(input.input.instanceId)
+        const evaluated = evaluateInstance(input.input.instanceId, instanceOutputs)
 
         return evaluated[input.input.output]
       })

package/src/library/worker/loader.ts

@@ -42,12 +42,12 @@ export async function loadLibrary(
   const modules: Record<string, unknown> = {}
   for (const modulePath of modulePaths) {
     try {
-      logger.debug("loading module", { modulePath })
+      logger.debug({ modulePath }, "loading module")
       modules[modulePath] = await jiti.import(modulePath)
 
-      logger.debug("module loaded", { modulePath })
-    } catch (error) {
-      logger.error("module load failed", { modulePath, error })
+      logger.debug({ modulePath }, "module loaded")
+    } catch (err) {
+      logger.error({ modulePath, err }, "module load failed")
     }
   }
 
@@ -56,12 +56,15 @@ export async function loadLibrary(
 
   await _loadLibrary(modules, components, entities)
 
-  logger.info("library loaded", {
-    componentCount: Object.keys(components).length,
-    entityCount: Object.keys(entities).length,
-  })
+  logger.info(
+    {
+      componentCount: Object.keys(components).length,
+      entityCount: Object.keys(entities).length,
+    },
+    "library loaded",
+  )
 
-  logger.trace("library content", { components, entities })
+  logger.trace({ components, entities }, "library content")
 
   return { components, entities }
 }

package/src/orchestrator/manager.ts

@@ -72,11 +72,13 @@ export class OperationManager {
       id: uuidv7(),
       projectId: request.projectId,
       type: request.type,
-      instanceIds: request.instanceIds,
-      affectedInstanceIds: request.instanceIds,
+      requestedInstanceIds: request.instanceIds,
+      instanceIdsToUpdate: [],
+      instanceIdsToDestroy: [],
       status: "pending",
       options: {
         forceUpdateDependencies: request.options?.forceUpdateDependencies ?? false,
+        forceUpdateChildren: request.options?.forceUpdateChildren ?? false,
         destroyDependentInstances: request.options?.destroyDependentInstances ?? true,
         invokeDestroyTriggers: request.options?.invokeDestroyTriggers ?? false,
         deleteUnreachableResources: request.options?.deleteUnreachableResources ?? false,