fmt

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

Author: karthik2804

package.json

@@ -3,8 +3,8 @@
   "version": "3.1.0",
   "description": "",
   "scripts": {
-    "fmt": "prettier --write \"src/**/*.{ts,tsx,js,jsx}\"",
-    "fmt-check": "prettier --check \"src/**/*.{ts,tsx,js,jsx}\"",
+    "fmt": "prettier --write \"packages/**/*.{ts,tsx,js,jsx}\"",
+    "fmt-check": "prettier --check \"packages/**/*.{ts,tsx,js,jsx}\"",
     "fmt-examples": "prettier --write \"examples/**/*.{ts,tsx,js,jsx}\" --ignore-patterm \"node_modules\""
   },
   "sideEffects": false,

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

@@ -1,32 +1,41 @@
-import { getPackagesWithWasiDeps, processWasiDeps } from "../../dist/wasiDepsParser.js";
+import {
+  getPackagesWithWasiDeps,
+  processWasiDeps,
+} from '../../dist/wasiDepsParser.js';
 class SpinSdkPlugin {
-    constructor() {
-        this.externals = {};
-    }
-
-    static async init() {
-        const { getWitImports } = await import("../../lib/wit_tools.js");
-        let plugin = new SpinSdkPlugin();
-
-        let wasiDeps = getPackagesWithWasiDeps(process.cwd(), new Set(), true);
-        let { witPaths, targetWorlds } = processWasiDeps(wasiDeps)
-
-        let imports = getWitImports(witPaths, targetWorlds);
-
-        imports.map((i) => {
-            plugin.externals[i] = i;
-        });
-
-        return plugin;
-    }
-
-    apply(compiler) {
-        if (compiler.options.externals && typeof compiler.options.externals === 'object') {
-            this.externals = Object.assign({}, compiler.options.externals, this.externals);
-        }
-        compiler.options.externals = this.externals;
+  constructor() {
+    this.externals = {};
+  }
+
+  static async init() {
+    const { getWitImports } = await import('../../lib/wit_tools.js');
+    let plugin = new SpinSdkPlugin();
+
+    let wasiDeps = getPackagesWithWasiDeps(process.cwd(), new Set(), true);
+    let { witPaths, targetWorlds } = processWasiDeps(wasiDeps);
+
+    let imports = getWitImports(witPaths, targetWorlds);
+
+    imports.map(i => {
+      plugin.externals[i] = i;
+    });
+
+    return plugin;
+  }
+
+  apply(compiler) {
+    if (
+      compiler.options.externals &&
+      typeof compiler.options.externals === 'object'
+    ) {
+      this.externals = Object.assign(
+        {},
+        compiler.options.externals,
+        this.externals,
+      );
     }
+    compiler.options.externals = this.externals;
+  }
 }
 
-
 export default SpinSdkPlugin;

packages/build-tools/src/build.ts

@@ -1,17 +1,28 @@
-import { calculateChecksum, fileExists, getExistingBuildData } from "./utils.js";
+import {
+  calculateChecksum,
+  fileExists,
+  getExistingBuildData,
+} from './utils.js';
 
 export function getBuildDataPath(src: string): string {
-    return `${src}.buildData.json`;
+  return `${src}.buildData.json`;
 }
 
-export async function ShouldComponentize(src: string, outputPath: string, componentizeVersion: string) {
+export async function ShouldComponentize(
+  src: string,
+  outputPath: string,
+  componentizeVersion: string,
+) {
+  const sourceChecksum = await calculateChecksum(src);
+  const existingBuildData = await getExistingBuildData(getBuildDataPath(src));
 
-    const sourceChecksum = await calculateChecksum(src);
-    const existingBuildData = await getExistingBuildData(getBuildDataPath(src));
+  if (
+    existingBuildData?.version == componentizeVersion &&
+    existingBuildData?.checksum === sourceChecksum &&
+    (await fileExists(outputPath))
+  ) {
+    return false;
+  }
 
-    if (existingBuildData?.version == componentizeVersion && existingBuildData?.checksum === sourceChecksum && await fileExists(outputPath)) {
-        return false;
-    }
-
-    return true
-}
+  return true;
+}

packages/build-tools/src/cli.ts

@@ -3,39 +3,38 @@ 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;
+  input: string;
+  output: string;
+  triggerType: string;
+  witPath?: string;
+  aot?: boolean;
 }
 
 export function getCliArgs(): CliArgs {
-    let args = yargs(hideBin(process.argv))
-        .option('input', {
-            alias: 'i',
-            describe: 'Path to the input file',
-            demandOption: true
-        })
-        .option('wit-path', {
-            alias: 'd',
-            describe: 'Path to wit file or folder',
-        })
-        .option('output', {
-            alias: 'o',
-            describe: 'Path to the output file',
-            default: 'component.wasm'
-        })
-        .option('trigger-type', {
-            alias: '-n',
-            describe: "Spin trigger to target",
-            demandOption: true
-        })
-        .option('aot', {
-            describe: "Enable Ahead of Time compilation",
-            type: 'boolean',
-        })
-        .argv as CliArgs;
+  let args = yargs(hideBin(process.argv))
+    .option('input', {
+      alias: 'i',
+      describe: 'Path to the input file',
+      demandOption: true,
+    })
+    .option('wit-path', {
+      alias: 'd',
+      describe: 'Path to wit file or folder',
+    })
+    .option('output', {
+      alias: 'o',
+      describe: 'Path to the output file',
+      default: 'component.wasm',
+    })
+    .option('trigger-type', {
+      alias: '-n',
+      describe: 'Spin trigger to target',
+      demandOption: true,
+    })
+    .option('aot', {
+      describe: 'Enable Ahead of Time compilation',
+      type: 'boolean',
+    }).argv as CliArgs;
 
-    return args;
-}
+  return args;
+}

packages/build-tools/src/index.ts

@@ -1,63 +1,79 @@
 #!/usr/bin/env node
 
-import { componentize } from "@bytecodealliance/componentize-js";
+import { componentize } from '@bytecodealliance/componentize-js';
 //@ts-ignore https://github.com/bytecodealliance/ComponentizeJS/pull/198
-import { version } from "@bytecodealliance/componentize-js"
-import { getPackagesWithWasiDeps, processWasiDeps } from "./wasiDepsParser.js";
+import { version } from '@bytecodealliance/componentize-js';
+import { getPackagesWithWasiDeps, processWasiDeps } from './wasiDepsParser.js';
 import { basename } from 'node:path';
 
-import { calculateChecksum, getPackageVersion, saveBuildData } from "./utils.js";
-import { getCliArgs } from "./cli.js";
-import { getBuildDataPath, ShouldComponentize } from "./build.js";
-import { readFile, writeFile } from "node:fs/promises";
-import { mergeWit } from "../lib/wit_tools.js"
+import {
+  calculateChecksum,
+  getPackageVersion,
+  saveBuildData,
+} from './utils.js';
+import { getCliArgs } from './cli.js';
+import { getBuildDataPath, ShouldComponentize } from './build.js';
+import { readFile, writeFile } from 'node:fs/promises';
+import { mergeWit } from '../lib/wit_tools.js';
 
 async function main() {
   try {
     // Parse CLI args
-    let CliArgs = getCliArgs()
+    let CliArgs = getCliArgs();
     let src = CliArgs.input;
     let outputPath = CliArgs.output;
 
     // Can remove the explicit typing once https://github.com/bytecodealliance/ComponentizeJS/pull/198 is merged and released
     let componentizeVersion = version as string;
 
     // Small optimization to skip componentization if the source file hasn't changed
-    if (!await ShouldComponentize(src, outputPath, componentizeVersion)) {
-      console.log("No changes detected in source file. Skipping componentization.");
+    if (!(await ShouldComponentize(src, outputPath, componentizeVersion))) {
+      console.log(
+        'No changes detected in source file. Skipping componentization.',
+      );
       return;
     }
-    console.log("Componentizing...");
+    console.log('Componentizing...');
 
     // generate wit world string
     let wasiDeps = getPackagesWithWasiDeps(process.cwd(), new Set(), true);
 
     let { witPaths, targetWorlds } = processWasiDeps(wasiDeps);
 
     // Get inline wit by merging the wits specified by all the dependencies
-    let inlineWit = mergeWit(witPaths, targetWorlds, "combined", "combined-wit:[email protected]");
+    let inlineWit = mergeWit(
+      witPaths,
+      targetWorlds,
+      'combined',
+      'combined-wit:[email protected]',
+    );
 
     const source = await readFile(src, 'utf8');
 
     const { component } = await componentize(source, inlineWit, {
       sourceName: basename(src),
       // TODO: CHeck if we need to enable http
       //@ts-ignore
-      enableFeatures: ["http"],
+      enableFeatures: ['http'],
     });
 
     await writeFile(outputPath, component);
 
     // Save the checksum of the input file along with the componentize version
-    await saveBuildData(getBuildDataPath(src), await calculateChecksum(src), componentizeVersion);
+    await saveBuildData(
+      getBuildDataPath(src),
+      await calculateChecksum(src),
+      componentizeVersion,
+    );
 
-    console.log("Component successfully written.");
+    console.log('Component successfully written.');
+  } catch (error) {
+    console.error(
+      'An error occurred during the componentization process:',
+      error,
+    );
+    console.error('Error:', error);
   }
-  catch (error) {
-    console.error("An error occurred during the componentization process:", error);
-    console.error("Error:", error);
-  }
-
 }
 
 main();