wesl-plugin 0.6.2 → 0.6.7

package/dist/pluginIndex.d.ts

@@ -1,9 +1,11 @@
-import { P as PluginExtension } from './PluginExtension-B_oge2T3.js';
-export { E as ExtensionEmitFn, a as PluginExtensionApi } from './PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { ExtensionEmitFn, PluginExtension, PluginExtensionApi } from "./PluginExtension-B9OlwcsY.js";
 
+//#region src/extensions/LinkExtension.d.ts
 declare const linkBuildExtension: PluginExtension;
 
+//#endregion
+//#region src/extensions/StaticExtension.d.ts
+
 /**
  * a wesl-js ?static build extension that statically links from the root file
  * and emits a JavaScript file containing the linked wgsl string.
@@ -16,4 +18,5 @@ declare const linkBuildExtension: PluginExtension;
  */
 declare const staticBuildExtension: PluginExtension;
 
-export { PluginExtension, linkBuildExtension, staticBuildExtension };
+//#endregion
+export { ExtensionEmitFn, PluginExtension, PluginExtensionApi, linkBuildExtension, staticBuildExtension };

package/dist/pluginIndex.js

@@ -1,82 +1,91 @@
-import "./chunk-JSBRDJBE.js";
-
-// src/extensions/LinkExtension.ts
 import path from "node:path";
-import { noSuffix } from "wesl";
-var linkBuildExtension = {
-  extensionName: "link",
-  emitFn: emitLinkJs
+import { link, noSuffix } from "wesl";
+import url from "node:url";
+import { resolve } from "import-meta-resolve";
+
+//#region src/extensions/LinkExtension.ts
+const linkBuildExtension = {
+	extensionName: "link",
+	emitFn: emitLinkJs
 };
+/** Emit a JavaScript LinkParams structure, ready for linking at runtime. */
 async function emitLinkJs(baseId, api) {
-  const { resolvedWeslRoot, toml, tomlDir } = await api.weslToml();
-  const { dependencies = [] } = toml;
-  const weslSrc = await api.weslSrc();
-  const rootModule = await api.weslMain(baseId);
-  const rootModuleName = noSuffix(rootModule);
-  const tomlRelative = path.relative(tomlDir, resolvedWeslRoot);
-  const debugWeslRoot = tomlRelative.replaceAll(path.sep, "/");
-  const sanitizedDeps = dependencies.map((dep) => dep.replaceAll("/", "_"));
-  const bundleImports = dependencies.map((p, i) => `import ${sanitizedDeps[i]} from "${p}";`).join("\n");
-  const rootName = path.basename(rootModuleName);
-  const paramsName = `link${rootName}Config`;
-  const linkParams = {
-    rootModuleName,
-    weslSrc,
-    debugWeslRoot
-  };
-  const libsStr = `libs: [${sanitizedDeps.join(", ")}]`;
-  const linkParamsStr = `{
+	const { resolvedWeslRoot, tomlDir } = await api.weslToml();
+	const weslSrc = await api.weslSrc();
+	const rootModule = await api.weslMain(baseId);
+	const rootModuleName = noSuffix(rootModule);
+	const tomlRelative = path.relative(tomlDir, resolvedWeslRoot);
+	const debugWeslRoot = tomlRelative.replaceAll(path.sep, "/");
+	const autoDeps = await api.weslDependencies();
+	const sanitizedDeps = autoDeps.map((dep) => dep.replaceAll("/", "_"));
+	const bundleImports = autoDeps.map((p, i) => `import ${sanitizedDeps[i]} from "${p}";`).join("\n");
+	const rootName = path.basename(rootModuleName);
+	const paramsName = `link${rootName}Config`;
+	const linkParams = {
+		rootModuleName,
+		weslSrc,
+		debugWeslRoot
+	};
+	const libsStr = `libs: [${sanitizedDeps.join(", ")}]`;
+	const linkParamsStr = `{
     ${serializeFields(linkParams)},
     ${libsStr},
   }`;
-  const src = `
+	const src = `
     ${bundleImports}
     export const ${paramsName} = ${linkParamsStr};
     export default ${paramsName};
     `;
-  return src;
+	return src;
 }
 function serializeFields(record) {
-  return Object.entries(record).map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`).join(",\n");
+	return Object.entries(record).map(([k, v]) => `    ${k}: ${JSON.stringify(v, null, 2)}`).join(",\n");
 }
 
-// src/extensions/StaticExtension.ts
-import { resolve } from "import-meta-resolve";
-import path2 from "node:path";
-import url from "node:url";
-import { link, noSuffix as noSuffix2 } from "wesl";
-var staticBuildExtension = {
-  extensionName: "static",
-  emitFn: emitStaticJs
+//#endregion
+//#region src/extensions/StaticExtension.ts
+/**
+* a wesl-js ?static build extension that statically links from the root file
+* and emits a JavaScript file containing the linked wgsl string.
+*
+* use it like this:
+*   import wgsl from "./shaders/app.wesl?static";
+*
+* or with conditions, like this:
+*   import wgsl from "../shaders/foo/app.wesl MOBILE=true FUN SAFE=false ?static";
+*/
+const staticBuildExtension = {
+	extensionName: "static",
+	emitFn: emitStaticJs
 };
+/** Emit a JavaScript file containing the wgsl string */
 async function emitStaticJs(baseId, api, conditions) {
-  const { resolvedWeslRoot, toml, tomlDir } = await api.weslToml();
-  const { dependencies = [] } = toml;
-  const parentModule = url.pathToFileURL(path2.join(tomlDir, "wesl.toml")).toString();
-  const libFileUrls = dependencies.map((d) => resolve(d, parentModule));
-  const futureLibs = libFileUrls.map((f) => import(f));
-  const libModules = await Promise.all(futureLibs);
-  const libs = libModules.map((m) => m.default);
-  const weslSrc = await api.weslSrc();
-  const rootModule = await api.weslMain(baseId);
-  const rootModuleName = noSuffix2(rootModule);
-  const tomlRelative = path2.relative(tomlDir, resolvedWeslRoot);
-  const debugWeslRoot = tomlRelative.replaceAll(path2.sep, "/");
-  const result = await link({
-    weslSrc,
-    rootModuleName,
-    debugWeslRoot,
-    libs,
-    conditions
-  });
-  const wgsl = result.dest;
-  const src = `
+	const { resolvedWeslRoot, tomlDir } = await api.weslToml();
+	const parentModule = url.pathToFileURL(path.join(tomlDir, "wesl.toml")).toString();
+	const dependencies = await api.weslDependencies();
+	const libFileUrls = dependencies.map((d) => resolve(d, parentModule));
+	const futureLibs = libFileUrls.map((f) => import(f));
+	const libModules = await Promise.all(futureLibs);
+	const libs = libModules.map((m) => m.default);
+	const weslSrc = await api.weslSrc();
+	const rootModule = await api.weslMain(baseId);
+	const rootModuleName = noSuffix(rootModule);
+	const tomlRelative = path.relative(tomlDir, resolvedWeslRoot);
+	const debugWeslRoot = tomlRelative.replaceAll(path.sep, "/");
+	const result = await link({
+		weslSrc,
+		rootModuleName,
+		debugWeslRoot,
+		libs,
+		conditions
+	});
+	const wgsl = result.dest;
+	const src = `
     export const wgsl = \`${wgsl}\`;
     export default wgsl;
   `;
-  return src;
+	return src;
 }
-export {
-  linkBuildExtension,
-  staticBuildExtension
-};
+
+//#endregion
+export { linkBuildExtension, staticBuildExtension };

package/dist/plugins/astro.d.ts

@@ -1,7 +1,7 @@
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
 
+//#region src/plugins/astro.d.ts
 declare const _default: (options: WeslPluginOptions) => any;
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/astro.js

@@ -1,18 +1,13 @@
-import {
-  WeslPlugin_default
-} from "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
+import { WeslPlugin_default } from "../WeslPlugin-DjY8zodn.js";
 
-// src/plugins/astro.ts
+//#region src/plugins/astro.ts
 var astro_default = (options) => ({
-  name: "wesl-plugin",
-  hooks: {
-    "astro:config:setup": async (astro) => {
-      astro.config.vite.plugins ||= [];
-      astro.config.vite.plugins.push(WeslPlugin_default.vite(options));
-    }
-  }
+	name: "wesl-plugin",
+	hooks: { "astro:config:setup": async (astro) => {
+		astro.config.vite.plugins ||= [];
+		astro.config.vite.plugins.push(WeslPlugin_default.vite(options));
+	} }
 });
-export {
-  astro_default as default
-};
+
+//#endregion
+export { astro_default as default };

package/dist/plugins/esbuild.d.ts

@@ -1,8 +1,8 @@
-import * as esbuild from 'esbuild';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as esbuild12 from "esbuild";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => esbuild.Plugin;
+//#region src/plugins/esbuild.d.ts
+declare const _default: (options: WeslPluginOptions) => esbuild12.Plugin;
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/esbuild.js

@@ -1,11 +1,8 @@
-import {
-  weslPlugin
-} from "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-
-// src/plugins/esbuild.ts
+import { weslPlugin } from "../WeslPlugin-DjY8zodn.js";
 import { createEsbuildPlugin } from "unplugin";
+
+//#region src/plugins/esbuild.ts
 var esbuild_default = createEsbuildPlugin(weslPlugin);
-export {
-  esbuild_default as default
-};
+
+//#endregion
+export { esbuild_default as default };

package/dist/plugins/farm.d.ts

@@ -1,8 +1,8 @@
-import * as _farmfe_core from '@farmfe/core';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as _farmfe_core8 from "@farmfe/core";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => _farmfe_core.JsPlugin;
+//#region src/plugins/farm.d.ts
+declare const _default: (options: WeslPluginOptions) => _farmfe_core8.JsPlugin;
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/farm.js

@@ -1,11 +1,8 @@
-import {
-  weslPlugin
-} from "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-
-// src/plugins/farm.ts
+import { weslPlugin } from "../WeslPlugin-DjY8zodn.js";
 import { createFarmPlugin } from "unplugin";
+
+//#region src/plugins/farm.ts
 var farm_default = createFarmPlugin(weslPlugin);
-export {
-  farm_default as default
-};
+
+//#endregion
+export { farm_default as default };

package/dist/plugins/nuxt.d.ts

@@ -1,10 +1,9 @@
-import * as _nuxt_schema from '@nuxt/schema';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as _nuxt_schema13 from "@nuxt/schema";
 
-interface ModuleOptions extends WeslPluginOptions {
-}
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
+//#region src/plugins/nuxt.d.ts
+interface ModuleOptions extends WeslPluginOptions {}
+declare const _default: _nuxt_schema13.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export { type ModuleOptions, _default as default };
+//#endregion
+export { ModuleOptions, _default as default };

package/dist/plugins/nuxt.js

@@ -1,28 +1,21 @@
-import {
-  webpack_default
-} from "../chunk-3YZCYXZ7.js";
-import {
-  vite_default
-} from "../chunk-ZK6IKQOJ.js";
-import "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-
-// src/plugins/nuxt.ts
+import "../WeslPlugin-DjY8zodn.js";
+import { vite_default } from "../vite-Bx_gff8v.js";
+import { webpack_default } from "../webpack-Bq0QiCAt.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
+
+//#region src/plugins/nuxt.ts
 var nuxt_default = defineNuxtModule({
-  meta: {
-    name: "nuxt-wesl-plugin",
-    configKey: "unpluginStarter"
-  },
-  defaults: {
-    // ...default options
-  },
-  setup(options, _nuxt) {
-    addVitePlugin(() => vite_default(options));
-    addWebpackPlugin(() => webpack_default(options));
-  }
+	meta: {
+		name: "nuxt-wesl-plugin",
+		configKey: "unpluginStarter"
+	},
+	defaults: {},
+	setup(options, _nuxt) {
+		addVitePlugin(() => vite_default(options));
+		addWebpackPlugin(() => webpack_default(options));
+	}
 });
-export {
-  nuxt_default as default
-};
+
+//#endregion
+export { nuxt_default as default };

package/dist/plugins/rollup.d.ts

@@ -1,8 +1,8 @@
-import * as rollup from 'rollup';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as rollup5 from "rollup";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => rollup.Plugin<any> | rollup.Plugin<any>[];
+//#region src/plugins/rollup.d.ts
+declare const _default: (options: WeslPluginOptions) => rollup5.Plugin<any> | rollup5.Plugin<any>[];
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/rollup.js

@@ -1,11 +1,8 @@
-import {
-  weslPlugin
-} from "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-
-// src/plugins/rollup.ts
+import { weslPlugin } from "../WeslPlugin-DjY8zodn.js";
 import { createRollupPlugin } from "unplugin";
+
+//#region src/plugins/rollup.ts
 var rollup_default = createRollupPlugin(weslPlugin);
-export {
-  rollup_default as default
-};
+
+//#endregion
+export { rollup_default as default };

package/dist/plugins/rspack.d.ts

@@ -1,7 +1,7 @@
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => RspackPluginInstance;
+//#region src/plugins/rspack.d.ts
+declare const _default: (options: WeslPluginOptions) => RspackPluginInstance;
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/rspack.js

@@ -1,11 +1,8 @@
-import {
-  weslPlugin
-} from "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-
-// src/plugins/rspack.ts
+import { weslPlugin } from "../WeslPlugin-DjY8zodn.js";
 import { createRspackPlugin } from "unplugin";
+
+//#region src/plugins/rspack.ts
 var rspack_default = createRspackPlugin(weslPlugin);
-export {
-  rspack_default as default
-};
+
+//#endregion
+export { rspack_default as default };

package/dist/plugins/vite.d.ts

@@ -1,8 +1,8 @@
-import * as vite from 'vite';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as vite1 from "vite";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => vite.Plugin<any> | vite.Plugin<any>[];
+//#region src/plugins/vite.d.ts
+declare const _default: (options: WeslPluginOptions) => vite1.Plugin<any> | vite1.Plugin<any>[];
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/vite.js

@@ -1,8 +1,4 @@
-import {
-  vite_default
-} from "../chunk-ZK6IKQOJ.js";
-import "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-export {
-  vite_default as default
-};
+import "../WeslPlugin-DjY8zodn.js";
+import { vite_default } from "../vite-Bx_gff8v.js";
+
+export { vite_default as default };

package/dist/plugins/webpack.d.ts

@@ -1,8 +1,8 @@
-import * as webpack from 'webpack';
-import { W as WeslPluginOptions } from '../WeslPluginOptions-ZzGgegv3.js';
-import '../PluginExtension-B_oge2T3.js';
-import 'wesl';
+import { WeslPluginOptions } from "../PluginExtension-B9OlwcsY.js";
+import * as webpack10 from "webpack";
 
-declare const _default: (options?: WeslPluginOptions | undefined) => webpack.WebpackPluginInstance;
+//#region src/plugins/webpack.d.ts
+declare const _default: (options: WeslPluginOptions) => webpack10.WebpackPluginInstance;
 
-export { _default as default };
+//#endregion
+export { _default as default };

package/dist/plugins/webpack.js

@@ -1,8 +1,4 @@
-import {
-  webpack_default
-} from "../chunk-3YZCYXZ7.js";
-import "../chunk-LHNI4JI3.js";
-import "../chunk-JSBRDJBE.js";
-export {
-  webpack_default as default
-};
+import "../WeslPlugin-DjY8zodn.js";
+import { webpack_default } from "../webpack-Bq0QiCAt.js";
+
+export { webpack_default as default };

package/dist/vite-Bx_gff8v.js

@@ -0,0 +1,8 @@
+import { weslPlugin } from "./WeslPlugin-DjY8zodn.js";
+import { createVitePlugin } from "unplugin";
+
+//#region src/plugins/vite.ts
+var vite_default = createVitePlugin(weslPlugin);
+
+//#endregion
+export { vite_default };

package/dist/webpack-Bq0QiCAt.js

@@ -0,0 +1,8 @@
+import { weslPlugin } from "./WeslPlugin-DjY8zodn.js";
+import { createWebpackPlugin } from "unplugin";
+
+//#region src/plugins/webpack.ts
+var webpack_default = createWebpackPlugin(weslPlugin);
+
+//#endregion
+export { webpack_default };

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "wesl-plugin",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.6.7",
   "dependencies": {
     "import-meta-resolve": "^4.1.0",
     "toml": "^3.0.0",
-    "unplugin": "^2.3.2",
-    "wesl": "0.6.2"
+    "unplugin": "^2.3.4",
+    "wesl": "0.6.7",
+    "wesl-tooling": "0.6.7"
   },
   "devDependencies": {
-    "@nuxt/kit": "^3.17.2",
-    "@nuxt/schema": "^3.17.2",
-    "bumpp": "^10.1.0",
+    "@nuxt/kit": "^3.17.3",
+    "@nuxt/schema": "^3.17.3",
+    "bumpp": "^10.1.1",
     "chalk": "^5.4.1",
     "nodemon": "^3.1.10",
-    "rollup": "^4.40.2",
-    "tsup": "^8.4.0",
+    "rollup": "^4.41.0",
+    "tsdown": "^0.11.12",
     "webpack": "^5.99.8"
   },
   "description": "",
@@ -92,8 +93,8 @@
   },
   "scripts": {
     "echo": "echo",
-    "build": "tsup",
-    "dev": "tsup --watch src --watch ../wesl/dist",
+    "build": "tsdown",
+    "dev": "tsdown --watch src --watch ../wesl/dist",
     "lint": "eslint .",
     "play": "npm -C playground run dev",
     "typecheck": "tsc"

package/src/BindingLayoutExtension.ts

@@ -1,9 +1,9 @@
-import { bindAndTransform, bindingStructsPlugin, LinkConfig } from "wesl";
+import { type LinkConfig, bindAndTransform, bindingStructsPlugin } from "wesl";
 import {
-    bindingGroupLayoutTs,
-    reportBindingStructsPlugin
+  bindingGroupLayoutTs,
+  reportBindingStructsPlugin,
 } from "../../wesl/src/Reflection.ts"; // LATER fix import
-import { PluginExtension, PluginExtensionApi } from "./PluginExtension.ts";
+import type { PluginExtension, PluginExtensionApi } from "./PluginExtension.ts";
 
 export const bindingLayoutExtension: PluginExtension = {
   extensionName: "bindingLayout",