@highstate/cli 0.9.16 → 0.9.19

package/assets/tsconfig.base.json

@@ -14,6 +14,11 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowJs": true,
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+    }
   },
-}
+}

package/dist/chunk-CMECLVT7.js

@@ -0,0 +1,11 @@
+// src/shared/utils.ts
+function int32ToBytes(value) {
+  const buffer = new ArrayBuffer(4);
+  const view = new DataView(buffer);
+  view.setInt32(0, value, true);
+  return new Uint8Array(buffer);
+}
+
+export { int32ToBytes };
+//# sourceMappingURL=chunk-CMECLVT7.js.map
+//# sourceMappingURL=chunk-CMECLVT7.js.map

package/dist/chunk-CMECLVT7.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/utils.ts"],"names":[],"mappings":";AAAO,SAAS,aAAa,KAAA,EAA2B;AACtD,EAAA,MAAM,MAAA,GAAS,IAAI,WAAA,CAAY,CAAC,CAAA;AAChC,EAAA,MAAM,IAAA,GAAO,IAAI,QAAA,CAAS,MAAM,CAAA;AAChC,EAAA,IAAA,CAAK,QAAA,CAAS,CAAA,EAAG,KAAA,EAAO,IAAI,CAAA;AAC5B,EAAA,OAAO,IAAI,WAAW,MAAM,CAAA;AAC9B","file":"chunk-CMECLVT7.js","sourcesContent":["export function int32ToBytes(value: number): Uint8Array {\n  const buffer = new ArrayBuffer(4)\n  const view = new DataView(buffer)\n  view.setInt32(0, value, true) // true for little-endian\n  return new Uint8Array(buffer)\n}\n"]}

package/dist/highstate.manifest.json

@@ -1,5 +1,5 @@
 {
   "sourceHashes": {
-    "./dist/main.js": "9fd51e93203bb202368349807424add573043c4fe8254095b4f5e4dfa76fedc0"
+    "./dist/main.js": 1411190614
   }
 }

package/dist/{library-loader-CGEPTS4L.js → library-loader-6TJTW2HX.js}

@@ -1,14 +1,9 @@
-// src/shared/library-loader.ts
-import {
-  isComponent,
-  isEntity,
-  isUnitModel,
-  originalCreate
-} from "@highstate/contract";
-import { serializeFunction } from "@pulumi/pulumi/runtime/index.js";
-import { Crc32, crc32 } from "@aws-crypto/crc32";
-import { encode } from "@msgpack/msgpack";
-import { int32ToBytes } from "@highstate/backend/shared";
+import { int32ToBytes } from './chunk-CMECLVT7.js';
+import console from 'node:console';
+import { isComponent, isEntity, isUnitModel } from '@highstate/contract';
+import { Crc32, crc32 } from '@aws-crypto/crc32';
+import { encode } from '@msgpack/msgpack';
+
 async function loadLibrary(logger, modulePaths) {
   const modules = {};
   for (const modulePath of modulePaths) {
@@ -16,8 +11,9 @@ async function loadLibrary(logger, modulePaths) {
       logger.debug({ modulePath }, "loading module");
       modules[modulePath] = await import(modulePath);
       logger.debug({ modulePath }, "module loaded");
-    } catch (err) {
-      logger.error({ modulePath, err }, "module load failed");
+    } catch (error) {
+      console.error(error);
+      throw new Error(`Failed to load module "${modulePath}"`, { cause: error });
     }
   }
   const components = {};
@@ -37,22 +33,31 @@ async function _loadLibrary(value, components, entities) {
   if (isComponent(value)) {
     const entityHashes = [];
     for (const entity of value.entities.values()) {
-      entity.definitionHash ??= calculateEntityDefinitionHash(entity);
-      entityHashes.push(entity.definitionHash);
+      entity.model.definitionHash ??= calculateEntityDefinitionHash(entity);
+      entityHashes.push(entity.model.definitionHash);
     }
     components[value.model.type] = value.model;
     value.model.definitionHash = await calculateComponentDefinitionHash(value, entityHashes);
     return;
   }
   if (isEntity(value)) {
-    entities[value.type] = value;
+    entities[value.type] = value.model;
     entities[value.type].definitionHash ??= calculateEntityDefinitionHash(value);
-    delete value.schema;
+    delete value.model.schema;
     return;
   }
   if (typeof value !== "object" || value === null) {
     return;
   }
+  if ("_zod" in value) {
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      await _loadLibrary(item, components, entities);
+    }
+    return;
+  }
   for (const key in value) {
     await _loadLibrary(value[key], components, entities);
   }
@@ -61,7 +66,7 @@ async function calculateComponentDefinitionHash(component, entityHashes) {
   const result = new Crc32();
   result.update(encode(component.model));
   if (!isUnitModel(component.model)) {
-    const serializedCreate = await serializeFunction(component[originalCreate]);
+    const serializedCreate = { text: "TODO: investigate why serializeFunction hangs" };
     result.update(Buffer.from(serializedCreate.text));
   }
   for (const entityHash of entityHashes) {
@@ -70,9 +75,9 @@ async function calculateComponentDefinitionHash(component, entityHashes) {
   return result.digest();
 }
 function calculateEntityDefinitionHash(entity) {
-  return crc32(encode(entity));
+  return crc32(encode(entity.model));
 }
-export {
-  loadLibrary
-};
-//# sourceMappingURL=library-loader-CGEPTS4L.js.map
+
+export { loadLibrary };
+//# sourceMappingURL=library-loader-6TJTW2HX.js.map
+//# sourceMappingURL=library-loader-6TJTW2HX.js.map

package/dist/library-loader-6TJTW2HX.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/shared/library-loader.ts"],"names":[],"mappings":"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","file":"library-loader-6TJTW2HX.js","sourcesContent":["import type { Logger } from \"pino\"\nimport console from \"node:console\"\nimport {\n  type Component,\n  type ComponentModel,\n  type Entity,\n  type EntityModel,\n  isComponent,\n  isEntity,\n  isUnitModel,\n} from \"@highstate/contract\"\nimport { Crc32, crc32 } from \"@aws-crypto/crc32\"\nimport { encode } from \"@msgpack/msgpack\"\nimport { int32ToBytes } from \"./utils\"\n\nexport type Library = Readonly<{\n  components: Readonly<Record<string, ComponentModel>>\n  entities: Readonly<Record<string, EntityModel>>\n}>\n\nexport async function loadLibrary(logger: Logger, modulePaths: string[]): 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 import(modulePath)\n\n      logger.debug({ modulePath }, \"module loaded\")\n    } catch (error) {\n      console.error(error)\n\n      throw new Error(`Failed to load module \"${modulePath}\"`, { cause: error })\n    }\n  }\n\n  const components: Record<string, ComponentModel> = {}\n  const entities: Record<string, EntityModel> = {}\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, ComponentModel>,\n  entities: Record<string, EntityModel>,\n): Promise<void> {\n  if (isComponent(value)) {\n    const entityHashes: number[] = []\n    for (const entity of value.entities.values()) {\n      entity.model.definitionHash ??= calculateEntityDefinitionHash(entity)\n      entityHashes.push(entity.model.definitionHash)\n    }\n\n    components[value.model.type] = value.model\n    value.model.definitionHash = await calculateComponentDefinitionHash(value, entityHashes)\n\n    return\n  }\n\n  if (isEntity(value)) {\n    entities[value.type] = value.model\n    entities[value.type].definitionHash ??= calculateEntityDefinitionHash(value)\n\n    // @ts-expect-error remove the schema since it's not needed in the designer\n    delete value.model.schema\n    return\n  }\n\n  if (typeof value !== \"object\" || value === null) {\n    return\n  }\n\n  if (\"_zod\" in value) {\n    // this is a zod schema, we can skip it\n    return\n  }\n\n  if (Array.isArray(value)) {\n    for (const item of value) {\n      await _loadLibrary(item, components, entities)\n    }\n\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(\n  component: Component,\n  entityHashes: number[],\n): Promise<number> {\n  const result = new Crc32()\n\n  // 1. include the full component model\n  result.update(encode(component.model))\n\n  if (!isUnitModel(component.model)) {\n    // 2. for composite components, include the content of the serialized create function\n    // const serializedCreate = await serializeFunction(component[originalCreate])\n    const serializedCreate = { text: \"TODO: investigate why serializeFunction hangs\" }\n    result.update(Buffer.from(serializedCreate.text))\n  }\n\n  // 3. include the hashes of all entities\n  for (const entityHash of entityHashes) {\n    result.update(int32ToBytes(entityHash))\n  }\n\n  return result.digest()\n}\n\nfunction calculateEntityDefinitionHash(entity: Entity): number {\n  return crc32(encode(entity.model))\n}\n"]}