grammar-composer 0.2.4 → 0.3.1

package/src/{test-grammars → tests/test-grammars}/RegExpGrammar.ts

@@ -1,9 +1,9 @@
-import * as G from '../GrammarComposer.js'
+import * as G from '../../exports/Exports.js'
 import * as R from 'regexp-composer'
 
 export class RegExpGrammar {
 	//////////////////////////////////////////////////////////////////////////////////////////////
-	// High level productions
+	// High-level productions
 	//////////////////////////////////////////////////////////////////////////////////////////////
 	disjunction = () => [
 		this.sequence,
@@ -14,7 +14,7 @@ export class RegExpGrammar {
 		])
 	]
 
-	sequence = () => G.oneOrMore(this.element)
+	sequence = () => G.zeroOrMore(this.element)
 
 	element = () => G.anyOf(
 		this.anchor,
@@ -66,14 +66,14 @@ export class RegExpGrammar {
 	)
 
 	uncapturedGroup = () => [
-		'(:',
+		'(?:',
 		this.disjunction,
 		')',
 	]
 
 	namedCaptureGroup = () => [
 		'(?<',
-		G.pattern(R.captureAs('name', R.oneOrMore(letter))),
+		G.pattern(R.captureAs('name', R.oneOrMore(identifierChar))),
 		'>',
 		this.disjunction,
 		')',
@@ -97,7 +97,7 @@ export class RegExpGrammar {
 	namedBackreference = () =>
 		G.pattern([
 			'\\k<',
-			R.captureAs('name', digit),
+			R.captureAs('name', R.oneOrMore(identifierChar)),
 			'>',
 		])
 
@@ -148,6 +148,7 @@ export class RegExpGrammar {
 		this.charClass,
 		this.unicodeProperty,
 		this.notUnicodeProperty,
+		this.escapedCharacterClass,
 		this.charcodeOrEscapedChar,
 		this.unreservedCharLiteral
 	)
@@ -170,15 +171,26 @@ export class RegExpGrammar {
 
 	controlCharcode = () => G.pattern([
 		'\\c',
-		R.charRange('A', 'Z'),
+		R.anyOf(R.charRange('A', 'Z'), R.charRange('a', 'z')),
 	])
 
-	codepoint = () => G.pattern([
-		'\\u',
-		'{',
-		R.captureAs('value', R.oneOrMore(hexDigit)),
-		'}',
-	])
+	nullCharcode = () => G.pattern('\\0')
+
+	codepoint = () => G.anyOf(
+		G.pattern([
+			'\\u',
+			'{',
+			R.captureAs('value', R.repeated([1, 6], hexDigit)),
+			'}',
+		]),
+		G.pattern([
+			'\\u',
+			hexDigit,
+			hexDigit,
+			hexDigit,
+			hexDigit
+		])
+	)
 
 	codepointRange = () => G.pattern([
 		'\\u',
@@ -201,10 +213,10 @@ export class RegExpGrammar {
 
 	unicodePropertyBodyPattern: R.Pattern = [
 		'{',
-		R.captureAs('property', R.oneOrMore(letterOrDigit)),
+		R.captureAs('property', R.oneOrMore(R.anyOf(letter, digit, '_', '-'))),
 		R.possibly([
 			'=',
-			R.captureAs('value', R.oneOrMore(letterOrDigit)),
+			R.captureAs('value', R.oneOrMore(R.anyOf(letter, digit, '_', '-'))),
 		]),
 		'}',
 	]
@@ -217,9 +229,9 @@ export class RegExpGrammar {
 		G.oneOrMore(G.anyOf(
 			this.charRange,
 			this.codepointRange,
-			this.charClass,
 			this.unicodeProperty,
 			this.notUnicodeProperty,
+			this.escapedCharacterClass,
 			this.charcodeOrEscapedChar,
 			this.charClassChar
 		)),
@@ -235,7 +247,7 @@ export class RegExpGrammar {
 
 	charRangeElement = G.anyOf(
 		this.charcodeOrEscapedChar,
-		G.pattern(R.anyChar),
+		G.pattern(R.notAnyOfChars(']')),
 	)
 
 	charRange = () => [
@@ -267,6 +279,8 @@ export class RegExpGrammar {
 		R.captureAs('nonWhitespace', escapedCharString.nonWhitespace),
 		R.captureAs('digit', escapedCharString.digit),
 		R.captureAs('nonDigit', escapedCharString.nonDigit),
+		R.captureAs('word', escapedCharString.word),
+		R.captureAs('nonWord', escapedCharString.nonWord),
 		R.captureAs('wordBoundary', escapedCharString.wordBoundary),
 		R.captureAs('nonWordBoundary', escapedCharString.nonWordBoundary),
 		R.captureAs('formFeed', escapedCharString.formFeed),
@@ -280,16 +294,16 @@ export class RegExpGrammar {
 
 const digit = R.charRange('0', '9')
 const letter = R.anyOf(R.charRange('a', 'z'), R.charRange('A', 'Z'))
-const letterOrDigit = R.anyOf(letter, digit)
 const hexDigit = R.anyOf(digit, R.charRange('a', 'f'), R.charRange('A', 'F'))
+const identifierChar = R.anyOf(letter, digit, '_', '$')
 
 const escapedCharString = {
 	whitespace: '\\s',
 	nonWhitespace: '\\S',
 	digit: '\\d',
 	nonDigit: '\\D',
-	word: '\\d',
-	nonWord: '\\D',
+	word: '\\w',
+	nonWord: '\\W',
 	wordBoundary: '\\b',
 	nonWordBoundary: '\\B',
 	formFeed: '\\f',

package/src/{test-grammars → tests/test-grammars}/XmlGrammar.ts

@@ -1,4 +1,4 @@
-import * as G from "../GrammarComposer.js"
+import * as G from '../../exports/Exports.js'
 import * as R from 'regexp-composer'
 
 export class XmlGrammar {

package/src/utilities/Timer.ts

@@ -1,4 +1,4 @@
-import { roundToDigits } from "./Utilities.js"
+import { roundToDigits } from './Utilities.js'
 
 declare const chrome: any
 declare const process: any

package/tsconfig.json

@@ -1,105 +1,55 @@
 {
-	"include": [
-		"src/**/*"
-	],
-	"compilerOptions": {
-		/* Visit https://aka.ms/tsconfig to read more about this file */
-		/* Projects */
-		// "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
-		// "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-		// "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
-		// "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
-		// "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-		// "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-		/* Language and Environment */
-		"target": "ES2022", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-		// "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-		// "jsx": "preserve",                                /* Specify what JSX code is generated. */
-		// "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
-		// "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-		// "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
-		// "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-		// "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
-		// "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
-		// "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-		// "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-		// "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
-		/* Modules */
-		"module": "Node16", /* Specify what module code is generated. */
-		// "rootDir": "./",                                  /* Specify the root folder within your source files. */
-		"moduleResolution": "Node16", /* Specify how TypeScript looks up a file from a given module specifier. */
-		// "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-		// "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-		// "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-		// "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-		// "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-		// "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
-		// "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
-		// "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
-		// "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
-		// "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-		// "noUncheckedSideEffectImports": true,             /* Check side effect imports. */
-		// "resolveJsonModule": true,                        /* Enable importing .json files. */
-		// "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
-		// "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
-		/* JavaScript Support */
-		// "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
-		// "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-		// "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
-		/* Emit */
-		"declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-		// "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-		// "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-		"sourceMap": true, /* Create source map files for emitted JavaScript files. */
-		// "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-		// "noEmit": true,                                   /* Disable emitting files from a compilation. */
-		// "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
-		"outDir": "./dist", /* Specify an output folder for all emitted files. */
-		// "removeComments": true,                           /* Disable emitting comments. */
-		// "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-		// "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-		// "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-		// "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-		// "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-		"emitBOM": false, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-		"newLine": "lf", /* Set the newline character for emitting files. */
-		// "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
-		// "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
-		// "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
-		// "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
-		// "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-		/* Interop Constraints */
-		"isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
-		// "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
-		// "isolatedDeclarations": true,                     /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
-		// "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-		"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
-		// "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-		"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
-		/* Type Checking */
-		"strict": true, /* Enable all strict type-checking options. */
-		// "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
-		// "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
-		// "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-		// "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-		// "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-		// "strictBuiltinIteratorReturn": true,              /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */
-		"noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
-		// "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
-		"alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
-		// "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
-		// "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
-		// "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-		"noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
-		// "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-		// "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
-		// "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-		// "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
-		// "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-		// "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-		/* Completeness */
-		// "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-		"skipLibCheck": true /* Skip type checking all .d.ts files. */
-	}
+  // Visit https://aka.ms/tsconfig to read more about this file
+  "compilerOptions": {
+	// File Layout
+	"rootDir": "./src",
+	"outDir": "./dist",
+
+	// Environment Settings
+	// See also https://aka.ms/tsconfig/module
+	"module": "nodenext",
+	"target": "esnext",
+	"types": ["node"],
+	// For nodejs:
+	// "lib": ["esnext"],
+	// "types": ["node"],
+	// and npm install -D @types/node
+
+	// Other Outputs
+	"sourceMap": true,
+	"declaration": true,
+	"declarationMap": true,
+
+	// Stricter Typechecking Options
+	// "noUncheckedIndexedAccess": true,
+	// "exactOptionalPropertyTypes": true,
+
+	// Style Options
+	"noImplicitReturns": true,
+	// "noImplicitOverride": true,
+	// "noUnusedLocals": true,
+	// "noUnusedParameters": true,
+	// "noFallthroughCasesInSwitch": true,
+	// "noPropertyAccessFromIndexSignature": true,
+
+	// Recommended Options
+	"strict": true,
+	"jsx": "react-jsx",
+	// "verbatimModuleSyntax": true,
+	"isolatedModules": true,
+	"noUncheckedSideEffectImports": true,
+	"moduleDetection": "force",
+	"skipLibCheck": true,
+
+	// Extended options not in generated tsconfig.json
+	"newLine": "lf",
+	"forceConsistentCasingInFileNames": true,
+	"alwaysStrict": true,
+
+	"noImplicitThis": true,
+	"strictBindCallApply": true,
+	"strictFunctionTypes": true,
+
+	"noErrorTruncation": true,
+  }
 }

package/dist/Exports.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/Exports.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Exports.js.map

package/dist/Exports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Exports.js","sourceRoot":"","sources":["../src/Exports.ts"],"names":[],"mappings":""}

package/dist/Grammar.d.ts

@@ -1,62 +0,0 @@
-import { Pattern } from 'regexp-composer';
-export declare function buildGrammar<T extends {
-    [key: string]: any;
-}>(obj: T | (new () => T), startProductionName: keyof T): Grammar<T>;
-export declare function detectAndErrorOnLeftRecursion(rootNode: GrammarElement): void;
-export declare function oneOrMore(content: Production): Repetition;
-export declare function zeroOrMore(content: Production): Repetition;
-export declare function anyOf(...members: Production[]): Choice;
-export declare function bestOf(...members: Production[]): Choice;
-export declare function possibly<T extends Production>(content: Production): T;
-export declare function cached<T extends Production>(content: Production): T;
-export declare function uncached<T extends Production>(content: Production): T;
-export declare function pattern(pattern: Pattern): PatternTerminal;
-export interface Grammar<T> {
-    rootElement: Nonterminal;
-    productions: {
-        [key in keyof T]: any;
-    };
-    maxElementId: number;
-}
-export type Production = string | GrammarElement | (() => Production) | Production[];
-export type GrammarElement = StringTerminal | PatternTerminal | Nonterminal | Sequence | Repetition | Choice | NonterminalReference;
-interface GrammarElementBase {
-    type: string;
-    optional: boolean;
-    uniqueId?: number;
-    cached?: boolean;
-}
-export type Terminal = StringTerminal | PatternTerminal;
-export interface StringTerminal extends GrammarElementBase {
-    type: 'StringTerminal';
-    content: string;
-}
-export interface PatternTerminal extends GrammarElementBase {
-    type: 'PatternTerminal';
-    name: string;
-    pattern: Pattern | Pattern[];
-    regExp: RegExp;
-}
-export interface Nonterminal extends GrammarElementBase {
-    type: 'Nonterminal';
-    name: string;
-    content: GrammarElement;
-}
-export interface Sequence extends GrammarElementBase {
-    type: 'Sequence';
-    members: GrammarElement[];
-}
-export interface Repetition extends GrammarElementBase {
-    type: 'Repetition';
-    content: GrammarElement;
-}
-export interface Choice extends GrammarElementBase {
-    type: 'Choice';
-    members: GrammarElement[];
-    exhaustive: boolean;
-}
-export interface NonterminalReference extends GrammarElementBase {
-    type: 'NonterminalReference';
-    reference: Function;
-}
-export {};