@highstate/backend 0.7.3 → 0.7.6

package/dist/library/source-resolution-worker.js

@@ -1,14 +1,14 @@
-import { workerData, parentPort } from 'node:worker_threads';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve as resolve$1, relative } from 'node:path';
-import { readFile } from 'node:fs/promises';
-import pino from 'pino';
-import { resolve } from 'import-meta-resolve';
-import { resolvePackageJSON, readPackageJSON } from 'pkg-types';
-
-const { requests, logLevel } = workerData;
-const logger = pino({ name: "source-resolution-worker", level: logLevel ?? "silent" });
-const results = await Promise.all(
+// src/library/source-resolution-worker.ts
+import { parentPort, workerData } from "node:worker_threads";
+import { fileURLToPath } from "node:url";
+import { dirname, relative, resolve } from "node:path";
+import { readFile } from "node:fs/promises";
+import pino from "pino";
+import { resolve as importMetaResolve } from "import-meta-resolve";
+import { readPackageJSON, resolvePackageJSON } from "pkg-types";
+var { requests, logLevel } = workerData;
+var logger = pino({ name: "source-resolution-worker", level: logLevel ?? "silent" });
+var results = await Promise.all(
   requests.map((request) => resolveUnitSourceSafe(request.source, request.unitType))
 );
 parentPort.postMessage({
@@ -25,12 +25,12 @@ async function resolveUnitSourceSafe(source, unitType) {
 }
 async function resolveUnitSource(source, unitType) {
   const fullPath = source.path ? `${source.package}/${source.path}` : source.package;
-  const url = resolve(fullPath, import.meta.url);
+  const url = importMetaResolve(fullPath, import.meta.url);
   const path = fileURLToPath(url);
   const projectPath = dirname(path);
   const packageJsonPath = await resolvePackageJSON(projectPath);
   const packageJson = await readPackageJSON(projectPath);
-  const manifestPath = resolve$1(dirname(packageJsonPath), "dist", "highstate.manifest.json");
+  const manifestPath = resolve(dirname(packageJsonPath), "dist", "highstate.manifest.json");
   let manifest;
   try {
     manifest = JSON.parse(await readFile(manifestPath, "utf8"));
@@ -53,3 +53,4 @@ async function resolveUnitSource(source, unitType) {
     allowedDependencies
   };
 }
+//# sourceMappingURL=source-resolution-worker.js.map

package/dist/library/source-resolution-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/library/source-resolution-worker.ts"],"sourcesContent":["import type { UnitSource } from \"@highstate/contract\"\nimport { parentPort, workerData } from \"node:worker_threads\"\nimport { fileURLToPath } from \"node:url\"\nimport { dirname, relative, resolve } from \"node:path\"\nimport { readFile } from \"node:fs/promises\"\nimport pino, { type Level } from \"pino\"\nimport { resolve as importMetaResolve } from \"import-meta-resolve\"\nimport { readPackageJSON, resolvePackageJSON } from \"pkg-types\"\n\nexport type SourceResolutionRequest = {\n  unitType: string\n  source: UnitSource\n}\n\nexport type SourceResolutionResult = {\n  unitType: string\n  projectPath: string\n  packageJsonPath: string\n  sourceHash: string\n  allowedDependencies: string[]\n}\n\nexport type HighstateManifestJson = {\n  sourceHashes?: Record<string, string>\n}\n\nconst { requests, logLevel } = workerData as {\n  requests: SourceResolutionRequest[]\n  logLevel?: Level\n}\n\nconst logger = pino({ name: \"source-resolution-worker\", level: logLevel ?? \"silent\" })\n\nconst results = await Promise.all(\n  requests.map(request => resolveUnitSourceSafe(request.source, request.unitType)),\n)\n\nparentPort!.postMessage({\n  type: \"result\",\n  results: results.filter((result): result is SourceResolutionResult => result !== null),\n})\n\nasync function resolveUnitSourceSafe(\n  source: UnitSource,\n  unitType: string,\n): Promise<SourceResolutionResult | null> {\n  try {\n    return await resolveUnitSource(source, unitType)\n  } catch (error) {\n    logger.error({ source, unitType, err: error }, \"failed to resolve unit source\")\n    return null\n  }\n}\n\nasync function resolveUnitSource(\n  source: UnitSource,\n  unitType: string,\n): Promise<SourceResolutionResult> {\n  const fullPath = source.path ? `${source.package}/${source.path}` : source.package\n\n  const url = importMetaResolve(fullPath, import.meta.url)\n  const path = fileURLToPath(url)\n  const projectPath = dirname(path)\n\n  const packageJsonPath = await resolvePackageJSON(projectPath)\n  const packageJson = await readPackageJSON(projectPath)\n\n  const manifestPath = resolve(dirname(packageJsonPath), \"dist\", \"highstate.manifest.json\")\n  let manifest: HighstateManifestJson | undefined\n  try {\n    manifest = JSON.parse(await readFile(manifestPath, \"utf8\")) as HighstateManifestJson\n  } catch (error) {\n    logger.debug({ error }, \"failed to read highstate manifest\")\n  }\n\n  let relativePath = relative(dirname(packageJsonPath), path)\n  relativePath = relativePath.startsWith(\".\") ? relativePath : `./${relativePath}`\n\n  const sourceHash = manifest?.sourceHashes?.[relativePath]\n  if (!sourceHash) {\n    logger.warn({ unitType, relativePath, packageName: packageJson.name }, \"source hash not found\")\n  }\n\n  // only the peer dependencies of the package are allowed to auto-install when they are missing\n  const allowedDependencies = Object.keys(packageJson.peerDependencies ?? {})\n\n  logger.debug({ packageJson }, \"package.json read\")\n\n  return {\n    unitType,\n    projectPath,\n    packageJsonPath,\n    sourceHash: sourceHash ?? \"\",\n    allowedDependencies,\n  }\n}\n"],"mappings":";AACA,SAAS,YAAY,kBAAkB;AACvC,SAAS,qBAAqB;AAC9B,SAAS,SAAS,UAAU,eAAe;AAC3C,SAAS,gBAAgB;AACzB,OAAO,UAA0B;AACjC,SAAS,WAAW,yBAAyB;AAC7C,SAAS,iBAAiB,0BAA0B;AAmBpD,IAAM,EAAE,UAAU,SAAS,IAAI;AAK/B,IAAM,SAAS,KAAK,EAAE,MAAM,4BAA4B,OAAO,YAAY,SAAS,CAAC;AAErF,IAAM,UAAU,MAAM,QAAQ;AAAA,EAC5B,SAAS,IAAI,aAAW,sBAAsB,QAAQ,QAAQ,QAAQ,QAAQ,CAAC;AACjF;AAEA,WAAY,YAAY;AAAA,EACtB,MAAM;AAAA,EACN,SAAS,QAAQ,OAAO,CAAC,WAA6C,WAAW,IAAI;AACvF,CAAC;AAED,eAAe,sBACb,QACA,UACwC;AACxC,MAAI;AACF,WAAO,MAAM,kBAAkB,QAAQ,QAAQ;AAAA,EACjD,SAAS,OAAO;AACd,WAAO,MAAM,EAAE,QAAQ,UAAU,KAAK,MAAM,GAAG,+BAA+B;AAC9E,WAAO;AAAA,EACT;AACF;AAEA,eAAe,kBACb,QACA,UACiC;AACjC,QAAM,WAAW,OAAO,OAAO,GAAG,OAAO,OAAO,IAAI,OAAO,IAAI,KAAK,OAAO;AAE3E,QAAM,MAAM,kBAAkB,UAAU,YAAY,GAAG;AACvD,QAAM,OAAO,cAAc,GAAG;AAC9B,QAAM,cAAc,QAAQ,IAAI;AAEhC,QAAM,kBAAkB,MAAM,mBAAmB,WAAW;AAC5D,QAAM,cAAc,MAAM,gBAAgB,WAAW;AAErD,QAAM,eAAe,QAAQ,QAAQ,eAAe,GAAG,QAAQ,yBAAyB;AACxF,MAAI;AACJ,MAAI;AACF,eAAW,KAAK,MAAM,MAAM,SAAS,cAAc,MAAM,CAAC;AAAA,EAC5D,SAAS,OAAO;AACd,WAAO,MAAM,EAAE,MAAM,GAAG,mCAAmC;AAAA,EAC7D;AAEA,MAAI,eAAe,SAAS,QAAQ,eAAe,GAAG,IAAI;AAC1D,iBAAe,aAAa,WAAW,GAAG,IAAI,eAAe,KAAK,YAAY;AAE9E,QAAM,aAAa,UAAU,eAAe,YAAY;AACxD,MAAI,CAAC,YAAY;AACf,WAAO,KAAK,EAAE,UAAU,cAAc,aAAa,YAAY,KAAK,GAAG,uBAAuB;AAAA,EAChG;AAGA,QAAM,sBAAsB,OAAO,KAAK,YAAY,oBAAoB,CAAC,CAAC;AAE1E,SAAO,MAAM,EAAE,YAAY,GAAG,mBAAmB;AAEjD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAY,cAAc;AAAA,IAC1B;AAAA,EACF;AACF;","names":[]}

package/dist/library/worker/main.js

@@ -1,35 +1,52 @@
-import { workerData, parentPort } from 'node:worker_threads';
-import { createJiti } from 'jiti';
-import { pino } from 'pino';
-import { mapValues } from 'remeda';
-import { e as errorToString } from '../../utils-ByadNcv4.js';
-import { BetterLock } from 'better-lock';
-import 'node:path';
-import 'pkg-types';
-import { isComponent, isEntity, isUnitModel, originalCreate, resetEvaluation, getCompositeInstances } from '@highstate/contract';
-import { serializeFunction } from '@pulumi/pulumi/runtime/index.js';
-import { sha256 } from 'crypto-hash';
-import 'zod';
+import {
+  errorToString
+} from "../../chunk-EQ4LMS7B.js";
+import {
+  __require
+} from "../../chunk-DGUM43GV.js";
 
-async function loadLibrary(jiti, logger, modulePaths) {
+// src/library/worker/main.ts
+import { parentPort, workerData } from "node:worker_threads";
+import { createJiti } from "jiti";
+import { pino } from "pino";
+import { mapValues } from "remeda";
+
+// src/library/worker/loader.ts
+import {
+  isComponent,
+  isEntity,
+  isUnitModel,
+  originalCreate
+} from "@highstate/contract";
+import { serializeFunction } from "@pulumi/pulumi/runtime/index.js";
+import { sha256 } from "crypto-hash";
+var Module = __require("module");
+var originalLoad = Module._load;
+Module._load = function(request, parent, isMain) {
+  if (request === "trace_events") {
+    return {};
+  }
+  return originalLoad(request, parent, isMain);
+};
+async function loadLibrary(jiti2, logger2, modulePaths) {
   const modules = {};
   for (const modulePath of modulePaths) {
     try {
-      logger.debug("loading module", { modulePath });
-      modules[modulePath] = await jiti.import(modulePath);
-      logger.debug("module loaded", { modulePath });
+      logger2.debug("loading module", { modulePath });
+      modules[modulePath] = await jiti2.import(modulePath);
+      logger2.debug("module loaded", { modulePath });
     } catch (error) {
-      logger.error("module load failed", { modulePath, error });
+      logger2.error("module load failed", { modulePath, error });
     }
   }
   const components = {};
   const entities = {};
   await _loadLibrary(modules, components, entities);
-  logger.info("library loaded", {
+  logger2.info("library loaded", {
     componentCount: Object.keys(components).length,
     entityCount: Object.keys(entities).length
   });
-  logger.trace("library content", { components, entities });
+  logger2.trace("library content", { components, entities });
   return { components, entities };
 }
 async function _loadLibrary(value, components, entities) {
@@ -64,17 +81,20 @@ async function calculateEntityDefinitionHash(entity) {
   return await sha256(JSON.stringify(entity));
 }
 
-const lock = new BetterLock();
-function evaluateModules(jiti, logger, modulePaths) {
+// src/library/worker/evaluator.ts
+import { getCompositeInstances, resetEvaluation } from "@highstate/contract";
+import { BetterLock } from "better-lock";
+var lock = new BetterLock();
+function evaluateModules(jiti2, logger2, modulePaths) {
   return lock.acquire(async () => {
     resetEvaluation();
     let lastModulePath = "";
     try {
       for (const modulePath of modulePaths) {
-        logger.info("loading module: %s", modulePath);
+        logger2.info("loading module: %s", modulePath);
         lastModulePath = modulePath;
-        await jiti.import(modulePath);
-        logger.debug("module loaded: %s", modulePath);
+        await jiti2.import(modulePath);
+        logger2.debug("module loaded: %s", modulePath);
       }
       return {
         success: true,
@@ -89,13 +109,13 @@ function evaluateModules(jiti, logger, modulePaths) {
     }
   });
 }
-function evaluateInstances(logger, library, allInstances, resolvedInputs, instanceIds) {
+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 ?? []) {
     try {
-      logger.debug({ instanceId }, "evaluating top-level instance");
+      logger2.debug({ instanceId }, "evaluating top-level instance");
       resetEvaluation();
       evaluateInstance(instanceId);
       results.push({
@@ -123,7 +143,7 @@ function evaluateInstances(logger, library, allInstances, resolvedInputs, instan
   function _evaluateInstance(instanceId) {
     const inputs = {};
     const instance = allInstancesMap.get(instanceId);
-    logger.info("evaluating instance", { instanceId });
+    logger2.info("evaluating instance", { instanceId });
     if (!instance) {
       throw new Error(`Instance not found: ${instanceId}`);
     }
@@ -133,7 +153,7 @@ function evaluateInstances(logger, library, allInstances, resolvedInputs, instan
         return evaluated[input2.input.output];
       });
     }
-    const component = library.components[instance.type];
+    const component = library2.components[instance.type];
     if (!component) {
       throw new Error(`Component not found: ${instance.type}, required by instance: ${instanceId}`);
     }
@@ -145,10 +165,11 @@ function evaluateInstances(logger, library, allInstances, resolvedInputs, instan
   }
 }
 
-const data = workerData;
-const logger = pino({ name: "library-worker", level: data.logLevel });
-let jiti;
-let library;
+// src/library/worker/main.ts
+var data = workerData;
+var logger = pino({ name: "library-worker", level: data.logLevel });
+var jiti;
+var library;
 try {
   logger.info("worker started");
   logger.trace({ data }, "worker data");
@@ -205,3 +226,4 @@ parentPort.on("message", async (message) => {
     });
   }
 });
+//# sourceMappingURL=main.js.map

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

@@ -0,0 +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","/* eslint-disable @typescript-eslint/no-unsafe-call */\n/* eslint-disable @typescript-eslint/no-unsafe-return */\n/* eslint-disable @typescript-eslint/no-unsafe-member-access */\n/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport type { Logger } from \"pino\"\nimport type { Jiti } from \"jiti\"\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\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst Module = require(\"module\")\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"]}

package/dist/shared/index.js

@@ -1,6 +1,102 @@
-export { I as CircularDependencyError, V as applyLibraryUpdate, y as applyPartialInstanceState, A as buildDependentInstanceStateMap, c as compositeInstanceSchema, J as createDefaultGraphResolverBackend, R as createInputHashResolver, M as createInputResolver, x as createInstanceState, z as createInstanceStatePatch, S as createValidationResolver, K as defineGraphResolver, U as diffLibraries, B as getAllDependentInstanceIds, Q as getMatchedInjectionInstanceInputs, N as getResolvedHubInputs, P as getResolvedInjectionInstanceInputs, O as getResolvedInstanceInputs, h as hubInstanceInputSchema, d as hubModelPatchSchema, e as hubModelSchema, j as instanceFileMetaSchema, k as instanceFileSchema, i as instanceInputSchema, a as instanceModelPatchSchema, b as instanceModelSchema, l as instancePageBlockSchema, m as instancePageMetaSchema, n as instancePageSchema, v as instanceStateSchema, w as instanceStateUpdateSchema, g as instanceStatusFieldSchema, f as instanceStatusSchema, q as instanceTerminalFileSchema, o as instanceTerminalMetaSchema, r as instanceTerminalSchema, u as instanceTriggerInvocationSchema, t as instanceTriggerSchema, s as instanceTriggerSpecSchema, H as isFinalOperationStatus, E as operationOptionsSchema, D as operationStatusSchema, C as operationTypeSchema, p as positionSchema, F as projectOperationRequestSchema, G as projectOperationSchema, L as resolverFactories, T as terminalSessionSchema } from '../library-BW5oPM7V.js';
-import 'zod';
-import 'remeda';
-import '@highstate/contract';
-import 'crypto-hash';
-import 'ajv';
+import {
+  CircularDependencyError,
+  applyLibraryUpdate,
+  applyPartialInstanceState,
+  buildDependentInstanceStateMap,
+  compositeInstanceSchema,
+  createDefaultGraphResolverBackend,
+  createInputHashResolver,
+  createInputResolver,
+  createInstanceState,
+  createInstanceStatePatch,
+  createValidationResolver,
+  defineGraphResolver,
+  diffLibraries,
+  getAllDependentInstanceIds,
+  getMatchedInjectionInstanceInputs,
+  getResolvedHubInputs,
+  getResolvedInjectionInstanceInputs,
+  getResolvedInstanceInputs,
+  hubInstanceInputSchema,
+  hubModelPatchSchema,
+  hubModelSchema,
+  instanceFileMetaSchema,
+  instanceFileSchema,
+  instanceInputSchema,
+  instanceModelPatchSchema,
+  instanceModelSchema,
+  instancePageBlockSchema,
+  instancePageMetaSchema,
+  instancePageSchema,
+  instanceStateSchema,
+  instanceStateUpdateSchema,
+  instanceStatusFieldSchema,
+  instanceStatusSchema,
+  instanceTerminalFileSchema,
+  instanceTerminalMetaSchema,
+  instanceTerminalSchema,
+  instanceTriggerInvocationSchema,
+  instanceTriggerSchema,
+  instanceTriggerSpecSchema,
+  isFinalOperationStatus,
+  operationOptionsSchema,
+  operationStatusSchema,
+  operationTypeSchema,
+  positionSchema,
+  projectOperationRequestSchema,
+  projectOperationSchema,
+  resolverFactories,
+  terminalSessionSchema
+} from "../chunk-TDCHA47F.js";
+import "../chunk-DGUM43GV.js";
+export {
+  CircularDependencyError,
+  applyLibraryUpdate,
+  applyPartialInstanceState,
+  buildDependentInstanceStateMap,
+  compositeInstanceSchema,
+  createDefaultGraphResolverBackend,
+  createInputHashResolver,
+  createInputResolver,
+  createInstanceState,
+  createInstanceStatePatch,
+  createValidationResolver,
+  defineGraphResolver,
+  diffLibraries,
+  getAllDependentInstanceIds,
+  getMatchedInjectionInstanceInputs,
+  getResolvedHubInputs,
+  getResolvedInjectionInstanceInputs,
+  getResolvedInstanceInputs,
+  hubInstanceInputSchema,
+  hubModelPatchSchema,
+  hubModelSchema,
+  instanceFileMetaSchema,
+  instanceFileSchema,
+  instanceInputSchema,
+  instanceModelPatchSchema,
+  instanceModelSchema,
+  instancePageBlockSchema,
+  instancePageMetaSchema,
+  instancePageSchema,
+  instanceStateSchema,
+  instanceStateUpdateSchema,
+  instanceStatusFieldSchema,
+  instanceStatusSchema,
+  instanceTerminalFileSchema,
+  instanceTerminalMetaSchema,
+  instanceTerminalSchema,
+  instanceTriggerInvocationSchema,
+  instanceTriggerSchema,
+  instanceTriggerSpecSchema,
+  isFinalOperationStatus,
+  operationOptionsSchema,
+  operationStatusSchema,
+  operationTypeSchema,
+  positionSchema,
+  projectOperationRequestSchema,
+  projectOperationSchema,
+  resolverFactories,
+  terminalSessionSchema
+};
+//# sourceMappingURL=index.js.map

package/dist/shared/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@highstate/backend",
-  "version": "0.7.3",
+  "version": "0.7.6",
   "type": "module",
   "files": [
     "dist",
-    "src"
+    "src",
+    "patches"
   ],
   "exports": {
     ".": {
@@ -22,10 +23,10 @@
     "access": "public"
   },
   "scripts": {
-    "build": "pkgroll --clean --tsconfig=tsconfig.build.json"
+    "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/contract": "^0.7.3",
+    "@highstate/contract": "^0.7.6",
     "@types/node": "^22.10.1",
     "ajv": "^8.17.1",
     "better-lock": "^3.2.0",
@@ -45,7 +46,7 @@
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "@pulumi/pulumi": "^3.142.0",
+    "@pulumi/pulumi": "^3.163.0",
     "classic-level": "^2.0.0"
   },
   "peerDependenciesMeta": {
@@ -57,12 +58,11 @@
     }
   },
   "devDependencies": {
-    "@pulumi/pulumi": "patch:@pulumi/pulumi@npm%3A3.159.0#~/.yarn/patches/@pulumi-pulumi-npm-3.159.0-d07eefce5c.patch",
     "classic-level": "^2.0.0",
+    "highstate-cli-bootstrap": "npm:@highstate/cli@0.7.4",
     "pino-pretty": "^13.0.0",
-    "pkgroll": "^2.5.1",
     "rollup": "^4.28.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "5cf7cec27262c8fa1d96f6478833b94841459d64"
+  "gitHead": "5acce7f9d8a57bdd1220e381d5b76d7b484b98c2"
 }

package/src/library/worker/loader.ts

@@ -1,3 +1,8 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
 import type { Logger } from "pino"
 import type { Jiti } from "jiti"
 import {
@@ -11,6 +16,18 @@ import {
 import { serializeFunction } from "@pulumi/pulumi/runtime/index.js"
 import { sha256 } from "crypto-hash"
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const Module = require("module")
+const originalLoad = Module._load
+
+Module._load = function (request: unknown, parent: unknown, isMain: boolean) {
+  if (request === "trace_events") {
+    return {}
+  }
+
+  return originalLoad(request, parent, isMain)
+}
+
 export type Library = Readonly<{
   components: Readonly<Record<string, Component>>
   entities: Readonly<Record<string, Entity>>

package/dist/utils-ByadNcv4.js

@@ -1,102 +0,0 @@
-import { z } from 'zod';
-
-async function runWithRetryOnError(runner, tryHandleError, maxRetries = 1) {
-  let lastError;
-  for (let i = 0; i < maxRetries + 1; i++) {
-    try {
-      return await runner();
-    } catch (e) {
-      lastError = e;
-      if (await tryHandleError(e)) {
-        continue;
-      }
-      throw e;
-    }
-  }
-  throw lastError;
-}
-class AbortError extends Error {
-  constructor(options) {
-    super("Operation aborted", options);
-  }
-}
-function isAbortError(error) {
-  return error instanceof Error && error.name === "AbortError";
-}
-const abortMessagePatterns = ["Operation aborted", "Command was killed with SIGINT"];
-function isAbortErrorLike(error) {
-  if (error instanceof Error) {
-    return abortMessagePatterns.some((pattern) => error.message.includes(pattern));
-  }
-  return false;
-}
-function tryWrapAbortErrorLike(error) {
-  if (isAbortErrorLike(error)) {
-    return new AbortError({ cause: error });
-  }
-  return error;
-}
-const stringArrayType = z.string().transform((args) => args.split(",").map((arg) => arg.trim()));
-function errorToString(error) {
-  if (error instanceof Error) {
-    return error.stack || error.message;
-  }
-  return JSON.stringify(error);
-}
-function createAsyncBatcher(fn, { waitMs = 100, maxWaitTimeMs = 1e3 } = {}) {
-  let batch = [];
-  let activeTimeout = null;
-  let maxWaitTimeout = null;
-  let firstCallTimestamp = null;
-  async function processBatch() {
-    if (batch.length === 0) return;
-    const currentBatch = batch;
-    batch = [];
-    await fn(currentBatch);
-    if (maxWaitTimeout) {
-      clearTimeout(maxWaitTimeout);
-      maxWaitTimeout = null;
-    }
-    firstCallTimestamp = null;
-  }
-  function schedule() {
-    if (activeTimeout) clearTimeout(activeTimeout);
-    activeTimeout = setTimeout(() => {
-      activeTimeout = null;
-      void processBatch();
-    }, waitMs);
-    if (!firstCallTimestamp) {
-      firstCallTimestamp = Date.now();
-      maxWaitTimeout = setTimeout(() => {
-        if (activeTimeout) clearTimeout(activeTimeout);
-        activeTimeout = null;
-        void processBatch();
-      }, maxWaitTimeMs);
-    }
-  }
-  return {
-    /**
-     * Add an item to the batch.
-     */
-    call(item) {
-      batch.push(item);
-      schedule();
-    },
-    /**
-     * Immediately flush the pending batch (if any).
-     */
-    async flush() {
-      if (activeTimeout) {
-        clearTimeout(activeTimeout);
-        activeTimeout = null;
-      }
-      if (maxWaitTimeout) {
-        clearTimeout(maxWaitTimeout);
-        maxWaitTimeout = null;
-      }
-      await processBatch();
-    }
-  };
-}
-
-export { AbortError as A, isAbortError as a, createAsyncBatcher as c, errorToString as e, isAbortErrorLike as i, runWithRetryOnError as r, stringArrayType as s, tryWrapAbortErrorLike as t };