Minor fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apexlang/core",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Apex language JavaScript library",
   "keywords": [
     "apex",

src/ast/visitor.ts

@@ -16,7 +16,7 @@ import {
 import { Document } from "./document";
 import { Annotation, Name } from "./nodes";
 import autoBind from "../auto-bind";
-import { WidlError } from "../error/error";
+import { ApexError } from "../error/error";
 import { Kind } from "./kinds";
 
 export class Writer {
@@ -57,13 +57,13 @@ interface NamedParameters {
 }
 
 class ErrorHolder {
-  errors: WidlError[];
+  errors: ApexError[];
 
   constructor() {
-    this.errors = new Array<WidlError>();
+    this.errors = new Array<ApexError>();
   }
 
-  reportError(error: WidlError): void {
+  reportError(error: ApexError): void {
     this.errors.push(error);
   }
 }
@@ -267,11 +267,11 @@ export class Context {
     });
   }
 
-  reportError(error: WidlError): void {
+  reportError(error: ApexError): void {
     this.errors.reportError(error);
   }
 
-  getErrors(): WidlError[] {
+  getErrors(): ApexError[] {
     return this.errors.errors;
   }
 }

src/blockstring.ts

@@ -4,7 +4,7 @@
  * Produces the value of a block string from its parsed raw value, similar to
  * CoffeeScript's block string, Python's docstring trim or Ruby's strip_heredoc.
  *
- * This implements the WIDL spec's BlockStringValue() static algorithm.
+ * This implements the Apex spec's BlockStringValue() static algorithm.
  *
  * @internal
  */

src/error/error.ts

@@ -1,6 +1,6 @@
 import { Node, Source } from "../ast";
 
-export class WidlError extends Error {
+export class ApexError extends Error {
   nodes: Array<Node> | Node | undefined;
   source: Source | undefined;
   positions: Array<number> | undefined;
@@ -25,8 +25,8 @@ export function syntaxError(
   source: Source,
   position: number,
   description: string
-): WidlError {
-  return new WidlError(
+): ApexError {
+  return new ApexError(
     `Syntax Error: ${description}`,
     undefined,
     source,
@@ -35,13 +35,13 @@ export function syntaxError(
   );
 }
 
-export function importError(node: Node, description: string): WidlError {
+export function importError(node: Node, description: string): ApexError {
   const loc = node.getLoc();
   var source: Source | undefined;
   if (loc != undefined) {
     source = loc.source;
   }
-  return new WidlError(
+  return new ApexError(
     `Import Error: ${description}`,
     node,
     source,
@@ -50,13 +50,13 @@ export function importError(node: Node, description: string): WidlError {
   );
 }
 
-export function validationError(node: Node, description: string): WidlError {
+export function validationError(node: Node, description: string): ApexError {
   const loc = node.getLoc();
   var source: Source | undefined;
   if (loc != undefined) {
     source = loc.source;
   }
-  return new WidlError(
+  return new ApexError(
     `Validation Error: ${description}`,
     node,
     source,

src/parser.ts

@@ -1,6 +1,6 @@
 import { TokenKind } from "./token_kind";
 import { Lexer, getTokenDesc, getTokenKindDesc } from "./lexer";
-import { importError, syntaxError, WidlError } from "./error";
+import { importError, syntaxError, ApexError } from "./error";
 import autoBind from "./auto-bind";
 import {
   Location,
@@ -66,8 +66,8 @@ export type ParseOptions = {
 export type Resolver = (location: string, from: string) => string;
 
 /**
- * Given a WIDL source, parses it into a Document.
- * Throws WidlError if a syntax error is encountered.
+ * Given a Apex source, parses it into a Document.
+ * Throws ApexError if a syntax error is encountered.
  */
 export function parse(
   source: string,
@@ -79,12 +79,12 @@ export function parse(
 }
 
 /**
- * Given a string containing a WIDL value (ex. `[42]`), parse the AST for
+ * Given a string containing a Apex value (ex. `[42]`), parse the AST for
  * that value.
- * Throws WidlError if a syntax error is encountered.
+ * Throws ApexError if a syntax error is encountered.
  *
- * This is useful within tools that operate upon WIDL Values directly and
- * in isolation of complete WIDL documents.
+ * This is useful within tools that operate upon Apex Values directly and
+ * in isolation of complete Apex documents.
  *
  * Consider providing the results to the utility function: valueFromAST().
  */
@@ -1184,7 +1184,7 @@ class Parser {
    * Helper function for creating an error when an unexpected lexed token
    * is encountered.
    */
-  unexpected(atToken?: Token): WidlError {
+  unexpected(atToken?: Token): ApexError {
     const token = atToken ?? this._lexer.token;
     return syntaxError(
       this._lexer.source,

src/validator.ts

@@ -1,11 +1,11 @@
 import { Context, Document, MultiVisitor } from "./ast";
-import { WidlError } from "./error";
+import { ApexError } from "./error";
 import { ValidationRule } from "./rules";
 
 export function validate(
   doc: Document,
   ...rules: ValidationRule[]
-): WidlError[] {
+): ApexError[] {
   const context = new Context({});
 
   const ruleVisitors = rules.map((r) => new r());

templates/module/.template

@@ -1,10 +1,10 @@
 name: module
-description: A WIDL codegen project
+description: A Apex codegen project
 variables:
 
 - name: module
   description: The module name
-  prompt: Please enter the module name (e.g. @apexlang/mymodule)
+  prompt: Please enter the module name (e.g. @myorg/mymodule)
 
 - name: description
   description: The module description

templates/module/package.json.tmpl

@@ -58,7 +58,7 @@
     "release:preflight": "npm pack --dry-run"
   },
   "dependencies": {
-    "@apexlang/core": "^0.0.6"
+    "@apexlang/core": "^0.0.14"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",