@shaderfrog/core 2.0.0-beta.0 → 2.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaderfrog/core",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "Shaderfrog core",
   "type": "module",
   "files": [
@@ -34,13 +34,14 @@
     "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "@babel/preset-typescript": "^7.21.5",
+    "@shaderfrog/glsl-parser": "^5.0.0-beta.4",
     "@swc/core": "^1.6.7",
     "@types/lodash.groupby": "^4.6.7",
     "@types/three": "^0.156.0",
     "babylonjs": "^6.2.0",
     "prettier": "^3.3.2",
     "three": "^0.156.1",
-    "typescript": "^5.0.4",
+    "typescript": "^5.5.3",
     "vitest": "^1.6.0"
   },
   "dependencies": {

package/strategy/inject.d.ts

@@ -11,5 +11,5 @@ export interface InjectStrategy extends BaseStrategy {
  * Inject source code into an AST, in a find-and-replace style. This only
  * operates on statements right now
  */
-export declare const injectStrategy: (config: InjectStrategy['config']) => InjectStrategy;
+export declare const injectStrategy: (config: InjectStrategy["config"]) => InjectStrategy;
 export declare const applyInjectStrategy: ApplyStrategy<InjectStrategy>;

package/util/ast.d.ts

@@ -36,6 +36,7 @@ export declare const makeFnBodyStatementWithScopes: (body: string) => {
 };
 export declare const findFn: (name: string) => (ast: Program) => FunctionNode | undefined;
 export declare const findMain: (ast: Program) => FunctionNode | undefined;
+export declare const findMainOrThrow: (ast: Program) => FunctionNode;
 export declare const returnGlPosition: (fnName: string, ast: Program) => void;
 export declare const returnGlPositionHardCoded: (fnName: string, ast: Program, returnType: string, hardCodedReturn: string) => void;
 export declare const returnGlPositionVec3Right: (fnName: string, ast: Program) => void;

package/util/ast.js

@@ -254,6 +254,13 @@ export var findFn = function (name) {
     };
 };
 export var findMain = findFn('main');
+export var findMainOrThrow = function (ast) {
+    var main = findMain(ast);
+    if (!main) {
+        throw new Error('No main function found!');
+    }
+    return main;
+};
 export var returnGlPosition = function (fnName, ast) {
     return convertVertexMain(fnName, ast, 'vec4', function (assign) { return assign.expression.right; });
 };
@@ -317,10 +324,7 @@ var convertVertexMain = function (fnName, ast, returnType, generateRight) {
  */
 export var convert300MainToReturn = function (ast) {
     // Convert the main function to return a vec4
-    var main = findMain(ast);
-    if (!main) {
-        throw new Error('No main function found!');
-    }
+    var main = findMainOrThrow(ast);
     main.prototype.header.returnType.specifier.specifier.token =
         'vec4';
     // Find the output variable, as in "pc_fragColor" from  "out highp vec4 pc_fragColor;"

package/util/ensure.d.ts

@@ -1 +1 @@
-export declare const ensure: <T>(argument: T, message?: string) => T;
+export declare const ensure: <T>(argument: T | undefined | null, message?: string) => T;

package/util/whitespace.test.js

@@ -1,12 +1,12 @@
 import { expect, it } from 'vitest';
 import { parser } from '@shaderfrog/glsl-parser';
 import { generate } from '@shaderfrog/glsl-parser';
-import { findMain } from './ast';
 import { addFnStmtWithIndent } from './whitespace';
+import { findMainOrThrow } from './ast';
 it("addFnStmtWithIndent", function () {
     var source = "void main() {\n  vec2 y;\n}\n";
     var ast = parser.parse(source, { quiet: true });
-    var m = findMain(ast);
+    var m = findMainOrThrow(ast);
     m.body.statements = addFnStmtWithIndent(m, "return x");
     // Should line up the whitespace properly!
     expect(generate(m)).toBe("void main() {\n  vec2 y;\n  return x;\n}\n");