@effindomv2/fui-as 0.1.39 → 0.1.42

package/browser/routed-app-conventions.ts

@@ -1 +1 @@
-export * from '../../browser-bridge/src/routed-app-conventions.js';
+export * from '@effindomv2/runtime/routed-app-conventions';

package/browser/src/shared-browser.ts

@@ -1,6 +1,3 @@
-export * from '../../../browser-bridge/src/managed-harness.js';
-export * from '../../../browser-bridge/src/managed-harness/abi-version.js';
-export * from '../../../browser-bridge/src/managed-harness/persisted-restore-policy.js';
-export * from '../../../browser-bridge/src/managed-harness/ui-chrome.js';
-export * from '../../../browser-bridge/src/routed-app-conventions.js';
-export * from '../../../browser-bridge/src/routed-harness.js';
+export * from '@effindomv2/runtime/managed-harness';
+export * from '@effindomv2/runtime/routed-app-conventions';
+export * from '@effindomv2/runtime/routed-harness';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-as",
-  "version": "0.1.39",
+  "version": "0.1.42",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 AssemblyScript frontend framework SDK and browser harness",
@@ -96,7 +96,7 @@
   },
   "dependencies": {
     "@assemblyscript/loader": "^0.28.19",
-    "@effindomv2/runtime": "0.1.20"
+    "@effindomv2/runtime": "0.1.22"
   },
   "devDependencies": {
     "@as-pect/assembly": "9.0.0",

package/scripts/build.sh

@@ -22,6 +22,11 @@ RUNTIME_CONFIG_FILE="effindom-runtime-config.js"
 DEFAULT_MANIFEST_PATH="./runtime/dist/effindom.v2.manifest.json"
 LOADING_OVERLAY_STYLES_FILE="${PACKAGE_DIR}/browser/loading-overlay-styles.html"
 LOADING_OVERLAY_BODY_FILE="${PACKAGE_DIR}/browser/loading-overlay-body.html"
+RUNTIME_PACKAGE_DIR="${PACKAGE_DIR}/node_modules/@effindomv2/runtime"
+
+if [ ! -d "${RUNTIME_PACKAGE_DIR}" ]; then
+  RUNTIME_PACKAGE_DIR="${REPO_ROOT}/node_modules/@effindomv2/runtime"
+fi
 
 rm -rf "${OUT_DIR}"
 mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${WORKER_BUILD_DIR}"
@@ -38,10 +43,28 @@ else
 fi
 
 ESBUILD_RUNTIME_ALIAS_ARGS=()
-if [ -f "${REPO_ROOT}/v2/browser-bridge/src/index.ts" ]; then
+LOCAL_RUNTIME_PACKAGE_JSON="${REPO_ROOT}/v2/browser-bridge/package.json"
+if [ -f "${LOCAL_RUNTIME_PACKAGE_JSON}" ]; then
+  REQUIRED_RUNTIME_VERSION="$(
+    node -e '
+      const pkg = require(process.argv[1]);
+      process.stdout.write(String(pkg.dependencies?.["@effindomv2/runtime"] ?? ""));
+    ' "${PACKAGE_DIR}/package.json"
+  )"
+  LOCAL_RUNTIME_VERSION="$(
+    node -e '
+      const pkg = require(process.argv[1]);
+      process.stdout.write(String(pkg.version ?? ""));
+    ' "${LOCAL_RUNTIME_PACKAGE_JSON}"
+  )"
+else
+  REQUIRED_RUNTIME_VERSION=""
+  LOCAL_RUNTIME_VERSION=""
+fi
+
+if [ -n "${REQUIRED_RUNTIME_VERSION}" ] && [ "${LOCAL_RUNTIME_VERSION}" = "${REQUIRED_RUNTIME_VERSION}" ]; then
   ESBUILD_RUNTIME_ALIAS_ARGS+=(
-    "--alias:@effindomv2/runtime=${REPO_ROOT}/v2/browser-bridge/src/index.ts"
-    "--alias:@effindomv2/runtime/core-types=${REPO_ROOT}/v2/browser-bridge/src/core-types.ts"
+    "--alias:@effindomv2/runtime=${REPO_ROOT}/v2/browser-bridge/src"
   )
 fi
 
@@ -308,7 +331,7 @@ npx esbuild "${PACKAGE_DIR}/demo/harness.ts" \
   --outfile="${DEMO_OUT_DIR}/harness.js" \
   --sourcemap
 
-npx esbuild "${REPO_ROOT}/v2/browser-bridge/src/managed-harness/file-processing-worker.ts" \
+npx esbuild "${RUNTIME_PACKAGE_DIR}/src/managed-harness/file-processing-worker.ts" \
   --bundle \
   --format=iife \
   --platform=browser \
@@ -323,7 +346,7 @@ cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${OUT_DIR}/file-processing-worker.js.m
 cp "${FILE_PROCESSING_WORKER_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js"
 cp "${FILE_PROCESSING_WORKER_MAP_BUILD}" "${DEMO_OUT_DIR}/file-processing-worker.js.map"
 
-npx esbuild "${REPO_ROOT}/v2/browser-bridge/src/managed-harness/worker-bootstrap.ts" \
+npx esbuild "${RUNTIME_PACKAGE_DIR}/src/managed-harness/worker-bootstrap.ts" \
   --bundle \
   --format=iife \
   --platform=browser \

package/scripts/check-runtime-dependency.sh

@@ -3,9 +3,7 @@
 set -euo pipefail
 
 PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-REPO_ROOT="$(cd "${PACKAGE_DIR}/../.." && pwd)"
 PACKAGE_JSON="${PACKAGE_DIR}/package.json"
-RUNTIME_PACKAGE_JSON="${REPO_ROOT}/v2/browser-bridge/package.json"
 
 if [ ! -f "${PACKAGE_JSON}" ]; then
   echo "Missing package.json at ${PACKAGE_JSON}" >&2
@@ -29,20 +27,3 @@ if ! printf '%s' "${runtime_spec}" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+([-.][0-9A
   echo "@effindomv2/runtime must be pinned to an exact version, found: ${runtime_spec}" >&2
   exit 1
 fi
-
-if [ -f "${RUNTIME_PACKAGE_JSON}" ]; then
-  runtime_version="$(
-    node -e '
-      const fs = require("node:fs");
-      const pkg = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
-      process.stdout.write(String(pkg.version ?? ""));
-    ' "${RUNTIME_PACKAGE_JSON}"
-  )"
-
-  if [ -n "${runtime_version}" ] && [ "${runtime_spec}" != "${runtime_version}" ]; then
-    echo "@effindomv2/fui-as depends on @effindomv2/runtime@${runtime_spec}, but monorepo runtime is ${runtime_version}." >&2
-    echo "Update v2/fui-as/package.json to match v2/browser-bridge/package.json." >&2
-    exit 1
-  fi
-fi
-

package/scripts/hostgen/assemblyscript-host-events.ts

@@ -117,12 +117,17 @@ export async function generateAssemblyScriptHostEventsFile(
   const callbackImport =
     primitivesImportOverride ??
     relativeImport(outputPath, path.resolve(path.dirname(modulePath), "..", "..", "src/FuiPrimitives.ts"));
+  const callbackNames = ["Callback0", "Callback1", "Callback2"].filter((_name, arity) =>
+    methods.some((method) => method.args.length === arity),
+  );
   const blocks: string[] = [
     "// @ts-nocheck",
     `// Generated by hostgen from ${sourcePathForHeader(modulePath)}#${exportName}.`,
-    `import { Callback0, Callback1, Callback2 } from "${callbackImport}";`,
-    "",
   ];
+  if (callbackNames.length > 0) {
+    blocks.push(`import { ${callbackNames.join(", ")} } from "${callbackImport}";`);
+    blocks.push("");
+  }
   methods.forEach((method, index) => {
     const callbackType = callbackTypeFor(method.args);
     const exportArgs = emitExportArgs(method.args);