wesl-plugin 0.6.0-pre5 → 0.6.0-pre7

package/dist/{PluginExtension-BPBKs2pN.d.ts → PluginExtension-egUuLQCG.d.ts}

@@ -2,19 +2,21 @@ import { WeslJsPlugin, ParsedRegistry } from 'wesl';
 
 /** loaded (or synthesized) info from .toml */
 interface WeslToml {
-    /** glob search strings to find .wesl/.wgsl files. Relative to the toml directory! */
+    /** glob search strings to find .wesl/.wgsl files. Relative to the toml directory. */
     weslFiles: string[];
-    /** base directory for wesl files. Relative to the toml directory! */
+    /** base directory for wesl files. Relative to the toml directory. */
     weslRoot: string;
+    /** names of directly referenced wesl shader packages (e.g. npm package names) */
+    dependencies?: string[];
 }
 interface WeslTomlInfo {
     /** The path to the toml file, relative to the cwd */
     tomlFile: string;
-    /** The path to the directory that contains the toml. Relative to the cwd. Paths inside the toml are relative to this. */
+    /** The path to the directory that contains the toml.
+     * Relative to the cwd. Paths inside the toml are relative to this. */
     tomlDir: string;
-    /**
-     * The wesl root, relative to the cwd. This lets us correctly do `path.resolve(resolvedWeslRoot, someShaderFile)`
-     */
+    /** The wesl root, relative to the cwd.
+     * This lets us correctly do `path.resolve(resolvedWeslRoot, someShaderFile)` */
     resolvedWeslRoot: string;
     /** The underlying toml file */
     toml: WeslToml;

package/dist/{chunk-ZJBZ62NB.js → chunk-MAE4GAHG.js}

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "./chunk-WRYP67OK.js";
+} from "./chunk-ZDLLLCLM.js";
 
 // src/plugins/vite.ts
 import { createVitePlugin } from "unplugin";

package/dist/{chunk-USWZ2CIV.js → chunk-NFFZEA4R.js}

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "./chunk-WRYP67OK.js";
+} from "./chunk-ZDLLLCLM.js";
 
 // src/plugins/webpack.ts
 import { createWebpackPlugin } from "unplugin";

package/dist/{chunk-WRYP67OK.js → chunk-ZDLLLCLM.js}

@@ -6700,7 +6700,6 @@ async function getRegistry(context, unpluginCtx) {
   const fullPaths = Object.keys(loaded).map(
     (p) => path2.resolve(resolvedWeslRoot, p)
   );
-  fullPaths.forEach((f) => unpluginCtx.addWatchFile(f));
   if (context.meta.watchMode) {
     fullPaths.forEach((f) => {
       chokidar.watch(f).on("change", () => {
@@ -6730,6 +6729,7 @@ async function loadWesl(context, unpluginCtx) {
     (g) => glob(g, { cwd: tomlDir, absolute: true })
   );
   const files = (await Promise.all(futureFiles)).flat();
+  files.forEach((f) => unpluginCtx.addWatchFile(f));
   return await loadFiles(files, resolvedWeslRoot);
 }
 async function loadFiles(files, weslRoot) {

package/dist/pluginIndex.d.ts

@@ -1,5 +1,5 @@
-import { P as PluginExtension } from './PluginExtension-BPBKs2pN.js';
-export { E as ExtensionEmitFn, a as PluginExtensionApi } from './PluginExtension-BPBKs2pN.js';
+import { P as PluginExtension } from './PluginExtension-egUuLQCG.js';
+export { E as ExtensionEmitFn, a as PluginExtensionApi } from './PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const linkBuildPlugin: PluginExtension;

package/dist/pluginIndex.js

@@ -2,40 +2,40 @@ import "./chunk-JSBRDJBE.js";
 
 // src/LinkExtension.ts
 import path from "node:path";
-import { noSuffix, packageReferences } from "wesl";
+import { noSuffix } from "wesl";
 var linkBuildPlugin = {
   extensionName: "link",
   emitFn: emitLinkJs
 };
 async function emitLinkJs(baseId, api) {
-  const { resolvedWeslRoot } = await api.weslToml();
+  const { resolvedWeslRoot, toml } = await api.weslToml();
+  const { dependencies = [] } = toml;
   const debugWeslRoot = resolvedWeslRoot.replaceAll(path.sep, "/");
   const weslSrc = await api.weslSrc();
   const rootModule = await api.weslMain(baseId);
   const rootModuleName = noSuffix(rootModule);
   const rootName = path.basename(rootModuleName);
-  const packages = scanForPackages(weslSrc);
-  const bundleImports = packages.map((p) => `import ${p} from "${p}";`).join("\n");
+  const bundleImports = dependencies.map((p) => `import ${p} from "${p}";`).join("\n");
   const paramsName = `link${rootName}Config`;
-  const linkSettings = JSON.stringify(
-    {
-      rootModuleName,
-      weslSrc,
-      debugWeslRoot,
-      dependencies: packages
-    },
-    null,
-    2
-  );
+  const linkParams = {
+    rootModuleName,
+    weslSrc,
+    debugWeslRoot
+  };
+  const libsStr = `libs: [${dependencies.join(", ")}]`;
+  const linkParamsStr = `{
+    ${serializeFields(linkParams)},
+    ${libsStr},
+  }`;
   const src = `
     ${bundleImports}
-    export const ${paramsName} = ${linkSettings};
+    export const ${paramsName} = ${linkParamsStr};
     export default ${paramsName};
     `;
   return src;
 }
-function scanForPackages(weslSrc) {
-  return Object.values(weslSrc).flatMap(packageReferences);
+function serializeFields(record) {
+  return Object.entries(record).map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`).join(",\n");
 }
 export {
   linkBuildPlugin

package/dist/plugins/astro.d.ts

@@ -1,5 +1,5 @@
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options: WeslPluginOptions) => any;

package/dist/plugins/astro.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin_default
-} from "../chunk-WRYP67OK.js";
+} from "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/astro.ts

package/dist/plugins/esbuild.d.ts

@@ -1,6 +1,6 @@
 import * as esbuild from 'esbuild';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => esbuild.Plugin;

package/dist/plugins/esbuild.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-WRYP67OK.js";
+} from "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/esbuild.ts

package/dist/plugins/farm.d.ts

@@ -1,6 +1,6 @@
 import * as _farmfe_core from '@farmfe/core';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => _farmfe_core.JsPlugin;

package/dist/plugins/farm.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-WRYP67OK.js";
+} from "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/farm.ts

package/dist/plugins/nuxt.d.ts

@@ -1,6 +1,6 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 interface ModuleOptions extends WeslPluginOptions {

package/dist/plugins/nuxt.js

@@ -1,10 +1,10 @@
 import {
   webpack_default
-} from "../chunk-USWZ2CIV.js";
+} from "../chunk-NFFZEA4R.js";
 import {
   vite_default
-} from "../chunk-ZJBZ62NB.js";
-import "../chunk-WRYP67OK.js";
+} from "../chunk-MAE4GAHG.js";
+import "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/nuxt.ts

package/dist/plugins/rollup.d.ts

@@ -1,6 +1,6 @@
 import * as rollup from 'rollup';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => rollup.Plugin<any> | rollup.Plugin<any>[];

package/dist/plugins/rollup.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-WRYP67OK.js";
+} from "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/rollup.ts

package/dist/plugins/rspack.d.ts

@@ -1,5 +1,5 @@
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => RspackPluginInstance;

package/dist/plugins/rspack.js

@@ -1,6 +1,6 @@
 import {
   weslPlugin
-} from "../chunk-WRYP67OK.js";
+} from "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 
 // src/plugins/rspack.ts

package/dist/plugins/vite.d.ts

@@ -1,6 +1,6 @@
 import * as vite from 'vite';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => vite.Plugin<any> | vite.Plugin<any>[];

package/dist/plugins/vite.js

@@ -1,7 +1,7 @@
 import {
   vite_default
-} from "../chunk-ZJBZ62NB.js";
-import "../chunk-WRYP67OK.js";
+} from "../chunk-MAE4GAHG.js";
+import "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 export {
   vite_default as default

package/dist/plugins/webpack.d.ts

@@ -1,6 +1,6 @@
 import * as webpack from 'webpack';
-import { W as WeslPluginOptions } from '../weslPluginOptions-BBX99ilB.js';
-import '../PluginExtension-BPBKs2pN.js';
+import { W as WeslPluginOptions } from '../weslPluginOptions-Om3wryHY.js';
+import '../PluginExtension-egUuLQCG.js';
 import 'wesl';
 
 declare const _default: (options?: WeslPluginOptions | undefined) => webpack.WebpackPluginInstance;

package/dist/plugins/webpack.js

@@ -1,7 +1,7 @@
 import {
   webpack_default
-} from "../chunk-USWZ2CIV.js";
-import "../chunk-WRYP67OK.js";
+} from "../chunk-NFFZEA4R.js";
+import "../chunk-ZDLLLCLM.js";
 import "../chunk-JSBRDJBE.js";
 export {
   webpack_default as default

package/dist/{weslPluginOptions-BBX99ilB.d.ts → weslPluginOptions-Om3wryHY.d.ts}

@@ -1,4 +1,4 @@
-import { P as PluginExtension } from './PluginExtension-BPBKs2pN.js';
+import { P as PluginExtension } from './PluginExtension-egUuLQCG.js';
 
 interface WeslPluginOptions {
     weslToml?: string;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "wesl-plugin",
   "type": "module",
-  "version": "0.6.0-pre5",
+  "version": "0.6.0-pre7",
   "dependencies": {
     "chokidar": "^4.0.3",
     "toml": "^3.0.0",
     "unplugin": "^2.1.2",
-    "wesl": "0.6.0-pre5"
+    "wesl": "0.6.0-pre7"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.15.2",

package/src/LinkExtension.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { noSuffix, packageReferences } from "wesl";
+import { LinkParams, noSuffix } from "wesl";
 import { PluginExtension, PluginExtensionApi } from "./PluginExtension.ts";
 
 export const linkBuildPlugin: PluginExtension = {
@@ -12,40 +12,43 @@ async function emitLinkJs(
   baseId: string,
   api: PluginExtensionApi,
 ): Promise<string> {
-  const { resolvedWeslRoot } = await api.weslToml();
+  const { resolvedWeslRoot, toml } = await api.weslToml();
+  const { dependencies = [] } = toml;
   const debugWeslRoot = resolvedWeslRoot.replaceAll(path.sep, "/");
   const weslSrc = await api.weslSrc();
   const rootModule = await api.weslMain(baseId);
   const rootModuleName = noSuffix(rootModule);
   const rootName = path.basename(rootModuleName);
-  const packages = scanForPackages(weslSrc);
 
-  const bundleImports = packages
+  const bundleImports = dependencies
     .map(p => `import ${p} from "${p}";`)
     .join("\n");
 
   const paramsName = `link${rootName}Config`;
 
-  const linkSettings = JSON.stringify(
-    {
-      rootModuleName,
-      weslSrc,
-      debugWeslRoot,
-      dependencies: packages,
-    },
-    null,
-    2,
-  );
+  const linkParams: LinkParams = {
+    rootModuleName,
+    weslSrc,
+    debugWeslRoot,
+  };
+
+  const libsStr = `libs: [${dependencies.join(", ")}]`;
+  const linkParamsStr = `{
+    ${serializeFields(linkParams)},
+    ${libsStr},
+  }`;
 
   const src = `
     ${bundleImports}
-    export const ${paramsName} = ${linkSettings};
+    export const ${paramsName} = ${linkParamsStr};
     export default ${paramsName};
     `;
 
   return src;
 }
 
-function scanForPackages(weslSrc: Record<string, string>): string[] {
-  return Object.values(weslSrc).flatMap(packageReferences);
+function serializeFields(record: Record<string, any>) {
+  return Object.entries(record)
+    .map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`)
+    .join(",\n");
 }

package/src/defaultSuffixTypes.d.ts

@@ -1,7 +1,7 @@
 /** @hidden */
 declare module "*?link" {
-  const linkConfig: LinkConfig;
-  export default linkConfig;
+  const linkParams: LinkParams;
+  export default linkParams;
 }
 
 /** @hidden */ // TODO move to separate package

package/src/weslPlugin.ts

@@ -24,22 +24,26 @@ import type { WeslPluginOptions } from "./weslPluginOptions.js";
 
 /** loaded (or synthesized) info from .toml */
 export interface WeslToml {
-  /** glob search strings to find .wesl/.wgsl files. Relative to the toml directory! */
+  /** glob search strings to find .wesl/.wgsl files. Relative to the toml directory. */
   weslFiles: string[];
 
-  /** base directory for wesl files. Relative to the toml directory! */
+  /** base directory for wesl files. Relative to the toml directory. */
   weslRoot: string;
+
+  /** names of directly referenced wesl shader packages (e.g. npm package names) */
+  dependencies?: string[];
 }
 
 export interface WeslTomlInfo {
   /** The path to the toml file, relative to the cwd */
   tomlFile: string;
-  /** The path to the directory that contains the toml. Relative to the cwd. Paths inside the toml are relative to this. */
+
+  /** The path to the directory that contains the toml.
+   * Relative to the cwd. Paths inside the toml are relative to this. */
   tomlDir: string;
 
-  /**
-   * The wesl root, relative to the cwd. This lets us correctly do `path.resolve(resolvedWeslRoot, someShaderFile)`
-   */
+  /** The wesl root, relative to the cwd.
+   * This lets us correctly do `path.resolve(resolvedWeslRoot, someShaderFile)` */
   resolvedWeslRoot: string;
 
   /** The underlying toml file */
@@ -242,9 +246,6 @@ async function getRegistry(
     path.resolve(resolvedWeslRoot, p),
   );
 
-  // trigger rebuild on shader file change
-  fullPaths.forEach(f => unpluginCtx.addWatchFile(f));
-
   // trigger clearing cache on shader file change
   if (context.meta.watchMode) {
     fullPaths.forEach(f => {
@@ -292,7 +293,10 @@ async function loadWesl(
     glob(g, { cwd: tomlDir, absolute: true }),
   );
   const files = (await Promise.all(futureFiles)).flat();
-  // dlog({ files, weslRoot, tomlDir, globs });
+
+  // trigger rebuild on shader file change
+  files.forEach(f => unpluginCtx.addWatchFile(f));
+
   return await loadFiles(files, resolvedWeslRoot);
 }