some review comment fixes and fix test

Signed-off-by: karthik2804 <[email protected]>

Author: karthik2804

.github/workflows/test.yaml

@@ -31,7 +31,7 @@ jobs:
           with:
             node-version: 22
 
-        # - name: Install depencies
+        # - name: Install dependencies
         #   shell: bash
         #   run: npm install --ws
 

packages/build-tools/package.json

@@ -20,6 +20,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.1",
     "@types/sinon": "^17.0.3",
+    "@types/yargs": "^17.0.33",
     "chai": "^5.2.0",
     "mocha": "^11.1.0",
     "prettier": "^3.5.0",
@@ -30,7 +31,6 @@
   "dependencies": {
     "@bytecodealliance/componentize-js": "^0.18.0",
     "@bytecodealliance/jco": "^1.10.2",
-    "@types/yargs": "^17.0.33",
     "yargs": "^17.7.2"
   },
   "files": [

packages/build-tools/plugins/webpack/index.js

@@ -2,6 +2,11 @@ import {
   getPackagesWithWasiDeps,
   processWasiDeps,
 } from '../../dist/wasiDepsParser.js';
+
+// The plugin is used to automatically add the wit imports to the webpack
+// externals. This is required because the bindings for wit imports are not
+// generated until we are componentizing and webpack needs to consider them
+// externals (available at runtime).
 class SpinSdkPlugin {
   constructor() {
     this.externals = {};
@@ -11,11 +16,15 @@ class SpinSdkPlugin {
     const { getWitImports } = await import('../../lib/wit_tools.js');
     let plugin = new SpinSdkPlugin();
 
+    // Get the list of wit dependencies from other packages as defined in the package.json.
     let wasiDeps = getPackagesWithWasiDeps(process.cwd(), new Set(), true);
     let { witPaths, targetWorlds } = processWasiDeps(wasiDeps);
 
+    // Get the list of wit imports from the world
     let imports = getWitImports(witPaths, targetWorlds);
 
+    // Convert the imports into a format that can be used to define the webpack
+    // externals that can be applied.
     imports.map(i => {
       plugin.externals[i] = i;
     });

packages/build-tools/src/cli.ts

@@ -1,11 +1,9 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-// Defining the shape of the arguments using TypeScript
 export interface CliArgs {
   input: string;
   output: string;
-  triggerType: string;
   witPath?: string;
   aot?: boolean;
   debug?: boolean;
@@ -27,11 +25,6 @@ export function getCliArgs(): CliArgs {
       describe: 'Path to the output file',
       default: 'component.wasm',
     })
-    .option('trigger-type', {
-      alias: '-t',
-      describe: 'Spin trigger to target',
-      demandOption: true,
-    })
     .option('aot', {
       describe: 'Enable Ahead of Time compilation',
       type: 'boolean',

packages/build-tools/src/index.ts

@@ -7,7 +7,6 @@ import { basename } from 'node:path';
 
 import {
   calculateChecksum,
-  getPackageVersion,
   saveBuildData,
 } from './utils.js';
 import { getCliArgs } from './cli.js';

packages/build-tools/src/utils.ts

@@ -1,40 +1,7 @@
 import { readFile } from 'fs/promises';
-import { fileURLToPath } from 'url';
-import path from 'path';
 import { createHash } from 'node:crypto';
 import { access, writeFile } from 'node:fs/promises';
 
-export const getPackageVersion = async (packageName: string) => {
-  try {
-    const resolvedPath = await import.meta.resolve(`${packageName}`);
-
-    let packageJsonPath = resolvedPath;
-    let parentDir = path.dirname(fileURLToPath(new URL(packageJsonPath)));
-
-    // Walk up the directory structure to find package.json
-    while (parentDir !== path.dirname(parentDir)) {
-      const potentialPackageJsonPath = path.join(parentDir, 'package.json');
-      try {
-        // Try reading the package.json file in this directory
-        const packageJsonContents = await readFile(
-          potentialPackageJsonPath,
-          'utf-8',
-        );
-        const packageJson = JSON.parse(packageJsonContents);
-
-        return packageJson.version;
-      } catch (error) {
-        parentDir = path.dirname(parentDir);
-      }
-    }
-
-    console.error(`Error: Could not find package.json for '${packageName}'`);
-    return null;
-  } catch (error) {
-    console.error(`Error: Could not find package '${packageName}'`, error);
-    return null;
-  }
-};
 
 // Function to calculate file checksum
 export async function calculateChecksum(filePath: string) {

packages/build-tools/wit/world.wit

@@ -1,5 +1,6 @@
 package spinframework:wasi-cli-environment@0.2.3;
 
+# Needed because of https://github.com/bytecodealliance/ComponentizeJS/issues/194
 world wasi-cli {
   import wasi:cli/environment@0.2.3;
 }

test/test-app/package-lock.json

@@ -7,7 +7,7 @@
   "keywords": [],
   "license": "Apache-2.0",
   "scripts": {
-    "build": "npx webpack && mkdirp dist && j2w -i build/bundle.js -n combined -o dist/test-app.wasm",
+    "build": "npx webpack && mkdirp dist && j2w -i build/bundle.js -o dist/test-app.wasm",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {