chore: remove gulp update deps (#65)

* chore: remove gulp update deps

* empty commit to retrigger checks

---------

Co-authored-by: Daphne Yang <daphne.yang@salesforce.com>

Author: peternhale

grammars/apex.tmLanguage.cson

@@ -31,16 +31,18 @@
     }
   ],
   "scripts": {
-    "build": "gulp",
-    "compile": "node ./node_modules/typescript/bin/tsc -p .",
+    "build:grammars": "node scripts/build-grammars.js",
+    "build:atom": "node scripts/build-atom.js",
+    "build:soql": "node scripts/build-soql.js",
+    "build": "npm run build:grammars && npm run build:atom && npm run build:soql",
+    "compile": "tsc -p .",
     "commit-init": "commitizen init cz-conventional-changelog --save-dev --save-exact --force",
     "commit": "git-cz",
-    "watch": "node ./node_modules/typescript/bin/tsc -w -p .",
+    "watch": "tsc -w -p .",
     "test:soql-tmgrammar": "vscode-tmgrammar-test -g \"./grammars/soql.tmLanguage\" \"./test/soql/*.soql\" ",
     "test:soql-tmgrammar-snapshots": "vscode-tmgrammar-snap -s source.soql -g \"./grammars/soql.tmLanguage\" \"./test/soql/snapshots/*.soql\" ",
-    "test": "gulp test && yarn run test:soql-tmgrammar && yarn run test:soql-tmgrammar-snapshots",
-    "prepare": "gulp",
-    "build:default": "gulp default",
+    "test": "npm run compile && mocha out/test/**/*.tests.js && npm run test:soql-tmgrammar && npm run test:soql-tmgrammar-snapshots",
+    "prepare": "npm run build",
     "format": "prettier --config .prettierrc.json --write './**/*.{ts,js,json,md}'"
   },
   "files": [
@@ -55,23 +57,18 @@
     "@commitlint/cli": "^17",
     "@commitlint/config-conventional": "^17",
     "@types/chai": "4.3.4",
-    "@types/gulp": "^4.0.10",
-    "@types/mocha": "^10.0.1",
+    "@types/mocha": "^10.0.10",
     "chai": "^4.3.7",
-    "commitizen": "^4.2.5",
+    "commitizen": "^4.3.1",
+    "cson-parser": "^4.0.9",
     "cz-conventional-changelog": "^3.3.0",
-    "gulp": "4.0.2",
-    "gulp-json2cson": "^2.0.0",
-    "gulp-mocha": "^8.0.0",
-    "gulp-typescript": "^5.0.1",
-    "gulp-yaml": "^2.0.4",
     "js-yaml": "^4.1.0",
     "mocha": "^10.1.0",
-    "plist": "^3.0.6",
+    "plist": "^3.1.0",
     "prettier": "^2.8.0",
     "typescript": "4.9.3",
-    "vscode-textmate": "7.0.4",
-    "vscode-tmgrammar-test": "^0.1.1"
+    "vscode-textmate": "^9.2.0",
+    "vscode-tmgrammar-test": "^0.1.3"
   },
   "husky": {
     "hooks": {
@@ -83,4 +80,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}

gulpfile.js

@@ -0,0 +1,35 @@
+const fs = require('fs');
+const path = require('path');
+const js_yaml = require('js-yaml');
+const cson = require('cson-parser');
+
+const inputGrammar = 'src/apex.tmLanguage.yml';
+const grammarsDirectory = 'grammars/';
+
+function handleError(err) {
+  console.error(err.toString());
+  process.exit(-1);
+}
+
+try {
+  // Create grammars directory if it doesn't exist
+  if (!fs.existsSync(grammarsDirectory)) {
+    fs.mkdirSync(grammarsDirectory);
+  }
+
+  // Read and parse YAML
+  const text = fs.readFileSync(inputGrammar);
+  const jsonData = js_yaml.load(text);
+
+  // Convert to CSON with pretty formatting - using default output
+  const csonData = cson.stringify(jsonData, null, 2);
+
+  // Write the output file
+  fs.writeFileSync(
+    path.join(grammarsDirectory, 'apex.tmLanguage.cson'),
+    csonData
+  );
+  console.log('Successfully built Atom grammar');
+} catch (err) {
+  handleError(err);
+}

package.json

@@ -0,0 +1,32 @@
+const fs = require('fs');
+const path = require('path');
+const js_yaml = require('js-yaml');
+const plist = require('plist');
+
+const inputGrammar = 'src/apex.tmLanguage.yml';
+const grammarsDirectory = 'grammars/';
+
+function handleError(err) {
+  console.error(err.toString());
+  process.exit(-1);
+}
+
+try {
+  // Create grammars directory if it doesn't exist
+  if (!fs.existsSync(grammarsDirectory)) {
+    fs.mkdirSync(grammarsDirectory);
+  }
+
+  // Read and parse YAML
+  const text = fs.readFileSync(inputGrammar);
+  const jsonData = js_yaml.load(text);
+
+  // Convert to plist
+  const plistData = plist.build(jsonData);
+
+  // Write the output file
+  fs.writeFileSync(path.join(grammarsDirectory, 'apex.tmLanguage'), plistData);
+  console.log('Successfully built TextMate grammar');
+} catch (err) {
+  handleError(err);
+}

scripts/build-atom.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+const js_yaml = require('js-yaml');
+const plist = require('plist');
+
+const inputGrammar = 'src/apex.tmLanguage.yml';
+const inputSoqlGrammarTemplate = 'src/soql.tmLanguage.template.yml';
+const grammarsDirectory = 'grammars/';
+
+function handleError(err) {
+  console.error(err.toString());
+  process.exit(-1);
+}
+
+try {
+  // Create grammars directory if it doesn't exist
+  if (!fs.existsSync(grammarsDirectory)) {
+    fs.mkdirSync(grammarsDirectory);
+  }
+
+  // Read and parse both grammars
+  const soqlGrammar = js_yaml.load(fs.readFileSync(inputSoqlGrammarTemplate));
+  const apexGrammar = js_yaml.load(fs.readFileSync(inputGrammar));
+
+  // Merge the repository of rules from Apex grammar
+  soqlGrammar['repository'] = Object.assign(
+    {},
+    apexGrammar.repository,
+    soqlGrammar['repository']
+  );
+
+  // Remove the comments rule SOQL query expression
+  const apexGrammarSoqlExpressionPatterns =
+    apexGrammar['repository']['soql-query-expression']['patterns'];
+  soqlGrammar['repository']['soql-query-expression']['patterns'] =
+    apexGrammarSoqlExpressionPatterns.filter(
+      (pattern) => pattern.include !== '#comment'
+    );
+
+  // Convert to plist and write
+  const plistData = plist.build(soqlGrammar);
+  fs.writeFileSync(path.join(grammarsDirectory, 'soql.tmLanguage'), plistData);
+  console.log('Successfully built SOQL grammar');
+} catch (err) {
+  handleError(err);
+}

scripts/build-grammars.js

@@ -4,7 +4,7 @@
  *  See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { INITIAL, StackElement } from 'vscode-textmate';
+import { INITIAL, StateStack } from 'vscode-textmate';
 import { TMRegistry } from './registry';
 
 const registry = new TMRegistry();
@@ -23,7 +23,7 @@ export async function tokenize(
   }
 
   let tokens: Token[] = [];
-  let previousStack: StackElement = INITIAL;
+  let previousStack: StateStack = INITIAL;
   const grammar = await registry.loadGrammar('apex');
 
   for (let lineIndex = 0; lineIndex < input.lines.length; lineIndex++) {