space-data-module-sdk 0.8.4 → 0.8.5

package/src/compiler/flatcSupport.js

@@ -1,11 +1,12 @@
 import path from "node:path";
 import { readFile } from "node:fs/promises";
-import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
 
 import { FlatcRunner } from "flatc-wasm";
 
-const SDK_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
-const SCHEMA_DIR = path.join(SDK_ROOT, "schemas");
+const require = createRequire(import.meta.url);
+const SDS_ROOT = path.dirname(require.resolve("spacedatastandards.org/package.json"));
+const SDS_SCHEMA_DIR = path.join(SDS_ROOT, "schema");
 
 let flatcRunnerPromise = null;
 let flatbuffersCppRuntimeHeadersPromise = null;
@@ -18,19 +19,21 @@ function loadFlatcRunner() {
   return flatcRunnerPromise;
 }
 
-async function loadInvokeSchemaFiles() {
-  const filenames = [
-    "TypedArenaBuffer.fbs",
-    "PluginInvokeRequest.fbs",
-    "PluginInvokeResponse.fbs",
-  ];
-  const entries = await Promise.all(
-    filenames.map(async (filename) => [
-      `/schemas/${filename}`,
-      await readFile(path.join(SCHEMA_DIR, filename), "utf8"),
-    ]),
-  );
-  return Object.fromEntries(entries);
+async function loadSdsInvokeSchemaFiles() {
+  return {
+    "/sds/TAB/main.fbs": await readFile(
+      path.join(SDS_SCHEMA_DIR, "TAB/main.fbs"),
+      "utf8",
+    ),
+    "/sds/PIV/main.fbs": await readFile(
+      path.join(SDS_SCHEMA_DIR, "PIV/main.fbs"),
+      "utf8",
+    ),
+  };
+}
+
+function rewriteGeneratedHeaderGuard(content, guardName) {
+  return String(content).replaceAll("FLATBUFFERS_GENERATED_MAIN_H_", guardName);
 }
 
 export async function getFlatbuffersCppRuntimeHeaders() {
@@ -47,18 +50,29 @@ export async function getInvokeCppSchemaHeaders() {
   if (!invokeCppSchemaHeadersPromise) {
     invokeCppSchemaHeadersPromise = (async () => {
       const flatc = await loadFlatcRunner();
-      const schemaFiles = await loadInvokeSchemaFiles();
       const generatedHeaders = {};
-      for (const entry of Object.keys(schemaFiles)) {
-        Object.assign(
-          generatedHeaders,
-          flatc.generateCode(
-            { entry, files: schemaFiles },
-            "cpp",
-            { genObjectApi: true },
-          ),
-        );
-      }
+      const sdsSchemaFiles = await loadSdsInvokeSchemaFiles();
+      const tabHeaders = flatc.generateCode(
+        { entry: "/sds/TAB/main.fbs", files: sdsSchemaFiles },
+        "cpp",
+        { genObjectApi: true },
+      );
+      const pivHeaders = flatc.generateCode(
+        { entry: "/sds/PIV/main.fbs", files: sdsSchemaFiles },
+        "cpp",
+        { genObjectApi: true },
+      );
+      generatedHeaders["sds/TAB/main_generated.h"] = rewriteGeneratedHeaderGuard(
+        tabHeaders["main_generated.h"],
+        "FLATBUFFERS_GENERATED_SDS_TAB_MAIN_H_",
+      );
+      generatedHeaders["sds/PIV/main_generated.h"] = rewriteGeneratedHeaderGuard(
+        pivHeaders["main_generated.h"].replace(
+          '#include "main_generated.h"',
+          '#include "sds/TAB/main_generated.h"',
+        ),
+        "FLATBUFFERS_GENERATED_SDS_PIV_MAIN_H_",
+      );
       return generatedHeaders;
     })();
   }

package/src/compiler/index.d.ts

@@ -11,6 +11,8 @@ export {
   createRecipientKeypairHex,
   ModuleThreadModel,
   protectModuleArtifact,
+  getFlatbuffersCppRuntimeHeaders,
+  getInvokeCppSchemaHeaders,
 } from "../index.js";
 
 export type {

package/src/compiler/index.js

@@ -6,9 +6,27 @@ export {
   protectModuleArtifact,
 } from "./compileModule.js";
 
+export {
+  analyzeWasmThreadFeatures,
+  assertPthreadArtifact,
+  assertSequentialArtifact,
+  assertSequentialFlagsAbsent,
+  SANCTIONED_WASI_TARGET,
+  assertPthreadFlagsPresent,
+  PTHREAD_FINAL_LINK_FLAGS,
+} from "./pthreadArtifactGuard.js";
+
+export { resolveWasiThreadsToolchain } from "./wasiThreadsToolchain.js";
+
+export {
+  getFlatbuffersCppRuntimeHeaders,
+  getInvokeCppSchemaHeaders,
+} from "./flatcSupport.js";
+
 export {
   createIsolatedEmceptionSession,
   createSharedEmceptionSession,
   loadSharedEmception,
   withSharedEmception,
 } from "./emception.js";
+export { generateLegacySdnShimSource } from "./sdnShimGenerator.js";