tstyche 4.1.0 → 4.2.0

package/build/tstyche.d.ts

@@ -558,6 +558,11 @@ declare class ExpectService {
     match(assertion: AssertionNode, onDiagnostics: DiagnosticsHandler<Diagnostic | Array<Diagnostic>>): MatchResult | undefined;
 }
 
+declare class Glob {
+    #private;
+    static toRegex(patterns: Array<string>, target: "directories" | "files"): RegExp;
+}
+
 declare class CancellationHandler implements EventHandler {
     #private;
     constructor(cancellationToken: CancellationToken, cancellationReason: CancellationReason);
@@ -810,5 +815,5 @@ declare class WhenService {
     action(when: WhenNode): void;
 }
 
-export { AssertionNode, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExitCodeHandler, ExpectResult, ExpectService, FileWatcher, InputService, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, ProjectService, Reject, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, SourceFile, Store, SummaryReporter, SuppressedService, TargetResult, Task, TaskResult, TestResult, TestTree, TestTreeNode, TestTreeNodeBrand, TestTreeNodeFlags, Text, Version, WatchReporter, WatchService, Watcher, WhenNode, WhenService, addsPackageText, argumentIsProvided, argumentOrTypeArgumentIsProvided, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, nodeBelongsToArgumentList, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { AssertionNode, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExitCodeHandler, ExpectResult, ExpectService, FileWatcher, Glob, InputService, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, ProjectService, Reject, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, ScribblerJsx, Select, SelectDiagnosticText, SetupReporter, SourceFile, Store, SummaryReporter, SuppressedService, TargetResult, Task, TaskResult, TestResult, TestTree, TestTreeNode, TestTreeNodeBrand, TestTreeNodeFlags, Text, Version, WatchReporter, WatchService, Watcher, WhenNode, WhenService, addsPackageText, argumentIsProvided, argumentOrTypeArgumentIsProvided, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, nodeBelongsToArgumentList, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
 export type { CodeFrameOptions, CommandLineOptions, ConfigFileOptions, DiagnosticsHandler, DirectiveRange, DirectiveRanges, EnvironmentOptions, Event, EventHandler, FileWatchHandler, InlineConfig, InputHandler, ItemDefinition, MatchResult, OptionDefinition, Plugin, Reporter, ReporterEvent, ResolvedConfig, ScribblerOptions, SelectHookContext, SuppressedError, SuppressedErrors, TargetResultStatus, TaskResultStatus, TextRange, TypeChecker, WatchHandler, WatcherOptions };

package/build/tstyche.js

@@ -2742,7 +2742,64 @@ class InputService {
     }
 }
 
-class GlobPattern {
+class Braces {
+    static expand(text) {
+        const start = text.indexOf("{");
+        if (start === -1) {
+            return [text];
+        }
+        let position = start;
+        let depth = 0;
+        for (position; position < text.length; position++) {
+            if (text[position] === "{") {
+                depth++;
+            }
+            else if (text[position] === "}") {
+                depth--;
+            }
+            if (depth === 0) {
+                break;
+            }
+        }
+        if (depth !== 0) {
+            return [text];
+        }
+        const before = text.slice(0, start);
+        const options = Braces.#splitOptions(text.slice(start + 1, position));
+        const after = text.slice(position + 1);
+        const result = [];
+        for (const option of options) {
+            for (const expanded of Braces.expand(option + after)) {
+                result.push(before + expanded);
+            }
+        }
+        return result;
+    }
+    static #splitOptions(optionText) {
+        const options = [];
+        let current = "";
+        let depth = 0;
+        for (const character of optionText) {
+            if (character === "," && depth === 0) {
+                options.push(current);
+                current = "";
+            }
+            else {
+                if (character === "{") {
+                    depth++;
+                }
+                if (character === "}") {
+                    depth--;
+                }
+                current += character;
+            }
+        }
+        options.push(current);
+        return options;
+    }
+}
+
+class Glob {
     static #reservedCharacterRegex = /[^\w\s/]/g;
     static #parse(pattern, usageTarget) {
         const segments = pattern.split("/");
@@ -2761,7 +2818,7 @@ class GlobPattern {
                 optionalSegmentCount++;
             }
             resultPattern += "\\/";
-            const segmentPattern = segment.replace(GlobPattern.#reservedCharacterRegex, GlobPattern.#replaceReservedCharacter);
+            const segmentPattern = segment.replace(Glob.#reservedCharacterRegex, Glob.#replaceReservedCharacter);
             if (segmentPattern !== segment) {
                 resultPattern += "(?!(node_modules)(\\/|$))";
             }
@@ -2781,7 +2838,10 @@ class GlobPattern {
         }
     }
     static toRegex(patterns, target) {
-        const patternText = patterns.map((pattern) => `(${GlobPattern.#parse(pattern, target)})`).join("|");
+        const patternText = patterns
+            .flatMap((pattern) => Braces.expand(pattern))
+            .map((pattern) => `(${Glob.#parse(pattern, target)})`)
+            .join("|");
         return new RegExp(`^(${patternText})$`);
     }
 }
@@ -2839,8 +2899,8 @@ class Select {
         let matchPatterns = Select.#patternsCache.get(globPatterns);
         if (!matchPatterns) {
             matchPatterns = {
-                includedDirectory: GlobPattern.toRegex(globPatterns, "directories"),
-                includedFile: GlobPattern.toRegex(globPatterns, "files"),
+                includedDirectory: Glob.toRegex(globPatterns, "directories"),
+                includedFile: Glob.toRegex(globPatterns, "files"),
             };
             Select.#patternsCache.set(globPatterns, matchPatterns);
         }
@@ -3723,7 +3783,7 @@ class SuppressedDiagnosticText {
         return [
             "Directive requires an argument.",
             "Add a fragment of the expected error message after the directive.",
-            "To ignore the directive, append a '!' character after it.",
+            "To ignore the directive, append the '!' character after it.",
         ];
     }
     static messageDidNotMatch() {
@@ -3956,7 +4016,9 @@ class MatchWorker {
         }
     }
     extendsObjectType(type) {
-        const nonPrimitiveType = { flags: this.#compiler.TypeFlags.NonPrimitive };
+        const nonPrimitiveType = "getNonPrimitiveType" in this.typeChecker
+            ? this.typeChecker.getNonPrimitiveType()
+            : { flags: this.#compiler.TypeFlags.NonPrimitive };
         return this.typeChecker.isTypeAssignableTo(type, nonPrimitiveType);
     }
     getParameterType(signature, index) {
@@ -5022,7 +5084,7 @@ class TaskRunner {
 class Runner {
     #eventEmitter = new EventEmitter();
     #resolvedConfig;
-    static version = "4.1.0";
+    static version = "4.2.0";
     constructor(resolvedConfig) {
         this.#resolvedConfig = resolvedConfig;
     }
@@ -5222,4 +5284,4 @@ class Cli {
     }
 }
 
-export { AssertionNode, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExitCodeHandler, ExpectResult, ExpectService, FileWatcher, InputService, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, ProjectService, Reject, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, SourceFile, Store, SummaryReporter, SuppressedService, TargetResult, Task, TaskResult, TestResult, TestTree, TestTreeNode, TestTreeNodeBrand, TestTreeNodeFlags, Text, Version, WatchReporter, WatchService, Watcher, WhenNode, WhenService, addsPackageText, argumentIsProvided, argumentOrTypeArgumentIsProvided, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, nodeBelongsToArgumentList, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };
+export { AssertionNode, BaseReporter, CancellationHandler, CancellationReason, CancellationToken, Cli, CollectService, Color, Config, ConfigDiagnosticText, DescribeResult, Diagnostic, DiagnosticCategory, DiagnosticOrigin, Directive, EventEmitter, ExitCodeHandler, ExpectResult, ExpectService, FileWatcher, Glob, InputService, Line, ListReporter, OptionBrand, OptionGroup, Options, OutputService, Path, PluginService, ProjectResult, ProjectService, Reject, Result, ResultCount, ResultHandler, ResultStatus, ResultTiming, Runner, Scribbler, Select, SelectDiagnosticText, SetupReporter, SourceFile, Store, SummaryReporter, SuppressedService, TargetResult, Task, TaskResult, TestResult, TestTree, TestTreeNode, TestTreeNodeBrand, TestTreeNodeFlags, Text, Version, WatchReporter, WatchService, Watcher, WhenNode, WhenService, addsPackageText, argumentIsProvided, argumentOrTypeArgumentIsProvided, defaultOptions, describeNameText, diagnosticBelongsToNode, diagnosticText, environmentOptions, fileViewText, formattedText, getDiagnosticMessageText, getTextSpanEnd, helpText, isDiagnosticWithLocation, nodeBelongsToArgumentList, summaryText, taskStatusText, testNameText, usesCompilerText, waitingForFileChangesText, watchUsageText };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tstyche",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Everything You Need for Type Testing.",
   "keywords": [
     "typescript",