@dxos/functions 0.7.5-labs.ea4b4c2 → 0.7.5-labs.ff2ff30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.7.5-labs.ea4b4c2",
+  "version": "0.7.5-labs.ff2ff30",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -66,27 +66,27 @@
     "get-port-please": "^3.1.1",
     "iso-did": "^1.6.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.7.5-labs.ea4b4c2",
-    "@dxos/context": "0.7.5-labs.ea4b4c2",
-    "@dxos/client": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-db": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-protocol": "0.7.5-labs.ea4b4c2",
-    "@dxos/echo-schema": "0.7.5-labs.ea4b4c2",
-    "@dxos/crypto": "0.7.5-labs.ea4b4c2",
-    "@dxos/edge-client": "0.7.5-labs.ea4b4c2",
-    "@dxos/invariant": "0.7.5-labs.ea4b4c2",
-    "@dxos/keys": "0.7.5-labs.ea4b4c2",
-    "@dxos/live-object": "0.7.5-labs.ea4b4c2",
-    "@dxos/node-std": "0.7.5-labs.ea4b4c2",
-    "@dxos/log": "0.7.5-labs.ea4b4c2",
-    "@dxos/protocols": "0.7.5-labs.ea4b4c2",
-    "@dxos/schema": "0.7.5-labs.ea4b4c2",
-    "@dxos/util": "0.7.5-labs.ea4b4c2"
+    "@dxos/async": "0.7.5-labs.ff2ff30",
+    "@dxos/context": "0.7.5-labs.ff2ff30",
+    "@dxos/client": "0.7.5-labs.ff2ff30",
+    "@dxos/echo-db": "0.7.5-labs.ff2ff30",
+    "@dxos/crypto": "0.7.5-labs.ff2ff30",
+    "@dxos/echo-protocol": "0.7.5-labs.ff2ff30",
+    "@dxos/edge-client": "0.7.5-labs.ff2ff30",
+    "@dxos/keys": "0.7.5-labs.ff2ff30",
+    "@dxos/echo-schema": "0.7.5-labs.ff2ff30",
+    "@dxos/live-object": "0.7.5-labs.ff2ff30",
+    "@dxos/log": "0.7.5-labs.ff2ff30",
+    "@dxos/node-std": "0.7.5-labs.ff2ff30",
+    "@dxos/protocols": "0.7.5-labs.ff2ff30",
+    "@dxos/invariant": "0.7.5-labs.ff2ff30",
+    "@dxos/schema": "0.7.5-labs.ff2ff30",
+    "@dxos/util": "0.7.5-labs.ff2ff30"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.7.5-labs.ea4b4c2"
+    "@dxos/agent": "0.7.5-labs.ff2ff30"
   },
   "publishConfig": {
     "access": "public"

package/src/bundler/bundler.test.ts

@@ -19,18 +19,20 @@ describe('Bundler', () => {
 
   test('Basic', async () => {
     const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
-    const result = await bundler.bundle('const x = 100'); // TODO(burdon): Test import.
+    const result = await bundler.bundle({ source: 'const x = 100' }); // TODO(burdon): Test import.
     expect(result.bundle).to.exist;
     expect(result.error).to.not.exist;
   });
 
   test('Import', async () => {
     const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
-    const result = await bundler.bundle(`
+    const result = await bundler.bundle({
+      source: `
       import { Filter } from './runtime.js';
 
       const query = Filter.typename('dxos.org/type/Example');
-    `);
+    `,
+    });
     expect(result.bundle).to.exist;
     expect(result.error).to.not.exist;
   });
@@ -38,17 +40,19 @@ describe('Bundler', () => {
   // TODO(dmaretskyi): Flaky on CI: https://cloud.nx.app/runs/Hjcifa8Ccq/task/plugin-script%3Atest
   test.skip('HTTPS Import', async () => {
     const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
-    const result = await bundler.bundle(`
+    const result = await bundler.bundle({
+      source: `
       import { invariant } from 'https://esm.sh/@dxos/invariant';
       invariant(true);
-    `);
+    `,
+    });
     expect(result.bundle).to.exist;
     expect(result.error).to.not.exist;
   });
 
   test('Error', async () => {
     const bundler = new Bundler({ platform: 'node', sandboxedModules: [], remoteModules: {} });
-    const result = await bundler.bundle("import missing from './module'; missing();");
+    const result = await bundler.bundle({ source: "import missing from './module'; missing();" });
     expect(result.bundle).to.not.exist;
     expect(result.error).to.exist;
   });

package/src/bundler/bundler.ts

@@ -15,9 +15,23 @@ export type Import = {
   namedImports: string[];
 };
 
-export type BundlerResult = {
+export type BundleOptions = {
+  /**
+   * Path to the source file on the local file system.
+   * If provided, the path will be used instead of the `source` code.
+   */
+  path?: string;
+
+  /**
+   * Source code to bundle.
+   * Required if `path` is not provided.
+   */
+  source?: string;
+};
+
+export type BundleResult = {
   timestamp: number;
-  sourceHash: Buffer;
+  sourceHash?: Buffer;
   imports?: Import[];
   bundle?: string;
   error?: any;
@@ -42,13 +56,13 @@ export const initializeBundler = async (options: { wasmUrl: string }) => {
 export class Bundler {
   constructor(private readonly _options: BundlerOptions) {}
 
-  async bundle(source: string): Promise<BundlerResult> {
+  async bundle({ path, source }: BundleOptions): Promise<BundleResult> {
     const { sandboxedModules: providedModules, ...options } = this._options;
 
-    const createResult = async (result?: Partial<BundlerResult>) => {
+    const createResult = async (result?: Partial<BundleResult>) => {
       return {
         timestamp: Date.now(),
-        sourceHash: Buffer.from(await subtleCrypto.digest('SHA-256', Buffer.from(source))),
+        sourceHash: source ? Buffer.from(await subtleCrypto.digest('SHA-256', Buffer.from(source))) : undefined,
         ...result,
       };
     };
@@ -58,7 +72,7 @@ export class Bundler {
       await initialized;
     }
 
-    const imports = analyzeSourceFileImports(source);
+    const imports = source ? analyzeSourceFileImports(source) : [];
 
     // https://esbuild.github.io/api/#build
     try {
@@ -67,7 +81,7 @@ export class Bundler {
         conditions: ['workerd', 'browser'],
         metafile: true,
         write: false,
-        entryPoints: ['memory:main.tsx'],
+        entryPoints: [path ?? 'memory:main.tsx'],
         bundle: true,
         format: 'esm',
         plugins: [