prettier-plugin-glsl - npm Package Compare versions

Comparing version 0.0.4 to 0.0.5

lib/errors.d.ts

@@ -1,2 +0,2 @@
-export declare const ERRORS: Record<string, string>
-//# sourceMappingURL=errors.d.ts.map
+export declare const ERRORS: Record<string, string>;
+//# sourceMappingURL=errors.d.ts.map

lib/lexer.d.ts

@@ -148,2 +148,3 @@ import { ILexingResult, IToken, Lexer, TokenType } from "chevrotain";
     const IN: TokenType;
+    const VARYING: TokenType;
     const BOOLCONSTANT: TokenType;
@@ -150,0 +151,0 @@ const FLOATCONSTANT: TokenType;

lib/nodes.d.ts

@@ -188,2 +188,3 @@ import { IToken } from "chevrotain";
     OUT: Token | undefined;
+    VARYING: Token | undefined;
     CONST: Token | undefined;
@@ -190,0 +191,0 @@ UNIFORM: Token | undefined;

lib/parser.d.ts

@@ -49,4 +49,4 @@ import { EmbeddedActionsParser, IRecognitionException, IRuleConfig, IToken, TokenType } from "chevrotain";
     selectionStatement: () => SelectionStatement;
-    statement: (newScope?: boolean | undefined) => Statement;
-    compoundStatement: (newScope?: boolean | undefined) => CompoundStatement;
+    statement: (newScope?: boolean) => Statement;
+    compoundStatement: (newScope?: boolean) => CompoundStatement;
     iterationStatement: () => IterationStatement;
@@ -56,3 +56,3 @@ translationUnit: () => TranslationUnit;
     protected uniformBlockHeader: import("chevrotain").ParserMethod<[], void>;
-    externalDeclaration: (uniformBlock?: boolean | undefined, function_?: boolean | undefined) => Declaration;
+    externalDeclaration: (uniformBlock?: boolean, function_?: boolean) => Declaration;
     ppDefine: () => PpDefine;
@@ -59,0 +59,0 @@ ppCall: () => PpCall;

package.json

@@ -12,3 +12,3 @@ {
   ],
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Prettier (https://prettier.io) plugin for GLSL (OpenGL Shading Language).",
@@ -46,26 +46,26 @@ "exports": "./lib/prettier-plugin.cjs.js",
   "devDependencies": {
-    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@types/dedent": "^0.7.0",
-    "@types/jest": "^27.4.1",
-    "@types/lodash": "^4.14.180",
-    "@types/node": "^17.0.23",
-    "@types/node-fetch": "^2.6.1",
-    "@types/prettier": "^2.4.4",
-    "@typescript-eslint/eslint-plugin": "^5.16.0",
-    "@typescript-eslint/parser": "^5.16.0",
-    "eslint": "^8.12.0",
+    "@types/jest": "^28.1.6",
+    "@types/lodash": "^4.14.182",
+    "@types/node": "^18.6.3",
+    "@types/node-fetch": "^2.6.2",
+    "@types/prettier": "^2.6.4",
+    "@typescript-eslint/eslint-plugin": "^5.31.0",
+    "@typescript-eslint/parser": "^5.31.0",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-cflint": "^1.0.0",
-    "eslint-plugin-import": "^2.25.4",
-    "filesize": "^8.0.7",
-    "jest": "^28.0.0-alpha.6",
-    "node-fetch": "^2.6.7",
-    "rollup": "^2.70.1",
+    "eslint-plugin-import": "^2.26.0",
+    "filesize": "^9.0.11",
+    "jest": "^28.1.3",
+    "node-fetch": "^3.2.10",
+    "rollup": "^2.77.2",
     "rollup-plugin-terser": "^7.0.2",
-    "ts-jest": "^27.1.4",
-    "ts-node-dev": "^1.1.8"
+    "ts-jest": "^28.0.7",
+    "ts-node-dev": "^2.0.0"
   },
   "resolutions": {
-    "jest": "^28.0.0-alpha.6"
+    "jest": "^28.1.3"
   }
 }

src/lexer.ts

@@ -110,3 +110,2 @@ // noinspection JSUnusedGlobalSymbols
   "using",
-  "varying",
   "volatile",
@@ -580,2 +579,3 @@ "volatile",
   export const IN = createKeyword("IN", PARAMETER_QUALIFIER)
+  export const VARYING = createKeyword("VARYING")
   export const BOOLCONSTANT = createToken({
@@ -582,0 +582,0 @@ name: "BOOLCONSTANT",

src/nodes.ts

@@ -262,2 +262,4 @@ import { IToken } from "chevrotain"
   OUT: Token | undefined
+  // Actually from OpenGL ES 1.00
+  VARYING: Token | undefined
   CONST: Token | undefined
@@ -607,3 +609,6 @@ UNIFORM: Token | undefined
   protected caseBlock(n: CaseBlock): R | undefined {
-    this.visit(n.case_)
+    this.visit(n.caseLabel)
+    for (const s of n.statements) {
+      this.visit(s)
+    }
     return
@@ -610,0 +615,0 @@ }

src/parser.ts

@@ -57,3 +57,9 @@ /* eslint-disable @typescript-eslint/member-ordering */
 } from "./nodes"
-import { ALL_TOKENS, checkLexingErrors, GLSL_LEXER, RESERVED_KEYWORDS, TOKEN } from "./lexer"
+import {
+  ALL_TOKENS,
+  checkLexingErrors,
+  GLSL_LEXER,
+  RESERVED_KEYWORDS,
+  TOKEN,
+} from "./lexer"
 import { DEV, ExpandedLocation, substrContext } from "./util"
@@ -620,3 +626,3 @@ import { applyLineContinuations, fixLocations } from "./preprocessor"
     (): StorageQualifier => {
-      let CONST, CENTROID, IN, OUT, UNIFORM
+      let CONST, CENTROID, IN, OUT, UNIFORM, VARYING
       this.OR([
@@ -630,2 +636,3 @@ { ALT: () => (CONST = this.CONSUME(TOKEN.CONST)) },
               { ALT: () => (OUT = this.CONSUME(TOKEN.OUT)) },
+              { ALT: () => (VARYING = this.CONSUME(TOKEN.VARYING)) },
             ])
@@ -636,3 +643,3 @@ },
       ])
-      return { kind: "storageQualifier", CONST, CENTROID, IN, OUT, UNIFORM }
+      return { kind: "storageQualifier", CONST, CENTROID, IN, OUT, VARYING, UNIFORM }
     },
@@ -897,3 +904,3 @@ )
             kind: "constantExpression",
-            _const: this.CONSUME(TOKEN.INTCONSTANT),
+            const_: this.CONSUME(TOKEN.INTCONSTANT),
           }),
@@ -900,0 +907,0 @@ },

src/prettier-plugin.ts

@@ -574,2 +574,5 @@ // noinspection JSUnusedGlobalSymbols
             }
+            if (n.VARYING) {
+              parts.push("varying ")
+            }
             if (n.UNIFORM) {
@@ -576,0 +579,0 @@ parts.push("uniform ")

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

533714

increased by0.16%

Lines of code

11733

increased by0.2%

Worsened metrics

Number of package files

46

decreased by-2.13%

No dependency changes