@eslint-sh/eslint-plugin 0.3.0 → 0.4.0

package/dist/language/shell-language.d.ts

@@ -1,12 +1,11 @@
-import type { ShFile, ShNode } from 'sh-ast';
 import type { File, Language, OkParseResult, ParseResult } from '@eslint/core';
 import { ShellSourceCode } from './shell-source-code.js';
+import type { ShellFile, ShellNode } from './syntax-view.js';
 import { type NormalizedShellLanguageOptions, type ShellLanguageOptions } from './shell-language-options.js';
 /**
  * `ShellLanguage` — the `@eslint/core` `Language` implementation for shell
- * scripts (design/ARCHITECTURE.md, "SourceCode and Language objects";
- * design/PACKAGES.md, `@eslint-sh/eslint-plugin`). Registered by the plugin
- * as `languages.sh`, so consumers select it via `language: "sh/sh"`.
+ * scripts. Registered by the plugin as `languages.sh`, so consumers select
+ * it via `language: "sh/sh"`.
  *
  * Implements `matchesSelectorClass` (the six launch esquery selector
  * classes — see `./selector-classes.js`), so rules and end users can write
@@ -49,23 +48,22 @@ export declare class ShellLanguage implements Language {
      * needed there, but `:loop :command` is) match a whole family of node
      * types instead of one literal type name. Delegates to
      * `./selector-classes.js`'s `SELECTOR_CLASS_NODE_TYPES` table for the six
-     * launch classes (design/ARCHITECTURE.md, "SourceCode and Language
-     * objects"); `ancestry` is unused today because none of the six launch
+     * launch classes; `ancestry` is unused today because none of the six launch
      * classes need ancestor context, but the parameter is accepted to match
      * `Language.matchesSelectorClass`'s signature exactly.
      */
-    matchesSelectorClass(className: string, node: ShNode, _ancestry: ShNode[]): boolean;
+    matchesSelectorClass(className: string, node: ShellNode, _ancestry: ShellNode[]): boolean;
     /**
      * Parses `file.body` (guaranteed to be a `string`, since `fileType` is
-     * `"text"`) via `sh-ast`'s `parseSync`, mapping the result to
+     * `"text"`) with one synchronous parse and its original-position snapshot,
+     * mapping the result to
      * the `{ok: true, ast}` / `{ok: false, errors}` shape `Language.parse` is
      * required to return. Never throws — parse failures are reported as
-     * fatal lint messages, per the `Language` contract
-     * (design/ARCHITECTURE.md, "Parse errors and dialects").
+     * fatal lint messages, per the `Language` contract.
      */
     parse(file: File, context: {
         languageOptions: ShellLanguageOptions;
-    }): ParseResult<ShFile>;
+    }): ParseResult<ShellFile>;
     /**
      * Creates the `ShellSourceCode` ESLint uses to run rules against `ast`.
      * `context.languageOptions` is ESLint's already-normalized copy (see
@@ -77,7 +75,7 @@ export declare class ShellLanguage implements Language {
      * direct construction (e.g. tests that skip the `Language` normalization
      * step), mirroring `parse()`'s `dialect` default above.
      */
-    createSourceCode(file: File, parseResult: OkParseResult<ShFile>, context: {
+    createSourceCode(file: File, parseResult: OkParseResult<ShellFile>, context: {
         languageOptions: ShellLanguageOptions;
     }): ShellSourceCode;
 }

package/dist/language/shell-language.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-language.d.ts","sourceRoot":"","sources":["../../src/language/shell-language.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAgB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAa,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE1F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAGL,KAAK,8BAA8B,EACnC,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AAsFrC;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAC5C,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAU;IACpC,QAAQ,CAAC,SAAS,EAAG,CAAC,CAAU;IAChC,QAAQ,CAAC,WAAW,EAAG,CAAC,CAAU;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAU;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA2B;IACzE,QAAQ,CAAC,sBAAsB,EAAE,oBAAoB,CAAuB;IAE5E;;;;;;;;OAQG;IACH,uBAAuB,CAAC,eAAe,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;;;OAMG;IACH,wBAAwB,CAAC,eAAe,EAAE,oBAAoB,GAAG,8BAA8B;IAI/F;;;;;;;;;;OAUG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO;IAInF;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAAE,eAAe,EAAE,oBAAoB,CAAA;KAAE,GAAG,WAAW,CAAC,MAAM,CAAC;IAY1F;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,EAClC,OAAO,EAAE;QAAE,eAAe,EAAE,oBAAoB,CAAA;KAAE,GACjD,eAAe;CAOnB"}
+{"version":3,"file":"shell-language.d.ts","sourceRoot":"","sources":["../../src/language/shell-language.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,IAAI,EAAa,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE1F,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAGL,KAAK,8BAA8B,EAEnC,KAAK,oBAAoB,EAC1B,MAAM,6BAA6B,CAAC;AA+CrC;;;;;;;;;;;;;;GAcG;AACH,qBAAa,aAAc,YAAW,QAAQ;IAC5C,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAU;IACpC,QAAQ,CAAC,SAAS,EAAG,CAAC,CAAU;IAChC,QAAQ,CAAC,WAAW,EAAG,CAAC,CAAU;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAU;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAA2B;IACzE,QAAQ,CAAC,sBAAsB,EAAE,oBAAoB,CAAuB;IAE5E;;;;;;;;OAQG;IACH,uBAAuB,CAAC,eAAe,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;;;OAMG;IACH,wBAAwB,CAAC,eAAe,EAAE,oBAAoB,GAAG,8BAA8B;IAI/F;;;;;;;;;OASG;IACH,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,OAAO;IAIzF;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;QAAE,eAAe,EAAE,oBAAoB,CAAA;KAAE,GAAG,WAAW,CAAC,SAAS,CAAC;IAiB7F;;;;;;;;;;OAUG;IACH,gBAAgB,CACd,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,aAAa,CAAC,SAAS,CAAC,EACrC,OAAO,EAAE;QAAE,eAAe,EAAE,oBAAoB,CAAA;KAAE,GACjD,eAAe;CAOnB"}

package/dist/language/shell-language.js

@@ -1,89 +1,51 @@
-import { ShAstError, ShParseError, parseSync, visitorKeys as shellVisitorKeys } from 'sh-ast';
+/** Adapts upstream parsing and diagnostics to ESLint's synchronous Language contract. */
+import { LangBash, LangBats, LangError, LangMirBSDKorn, LangPOSIX, LangZsh, ParseError, parseWithPositionsSync, } from 'sh-ast';
 import { matchesSelectorClass as matchesShellSelectorClass } from './selector-classes.js';
 import { ShellSourceCode } from './shell-source-code.js';
+import { SourceCoordinates } from './source-coordinates.js';
+import { adaptSyntaxFile, shellVisitorKeys } from './syntax-view.js';
 import { normalizeShellLanguageOptions, validateShellLanguageOptions, } from './shell-language-options.js';
-/**
- * `sh-ast`'s `visitorKeys` is deep-frozen and typed with
- * `readonly string[]` arrays (a shared, immutable table safe to hand to any
- * number of consumers). `@eslint/core`'s `Language.visitorKeys` types this
- * property as mutable `Record<string, string[]>` for historical reasons,
- * even though ESLint itself only ever reads it. Rather than cast away the
- * mismatch, build one genuinely mutable (if still logically frozen-in-spirit)
- * copy at module load — a one-time, small-object cost.
- */
+/** Configuration labels map to exact upstream constants; no shell-version policy is added to parsing. */
+const DIALECT_VARIANTS = {
+    bash: LangBash,
+    posix: LangPOSIX,
+    mksh: LangMirBSDKorn,
+    bats: LangBats,
+    zsh: LangZsh,
+};
+/** ESLint declares mutable visitor arrays; give it its own copy of the shared consumer relationships. */
 const mutableShellVisitorKeys = Object.fromEntries(Object.entries(shellVisitorKeys).map(([type, keys]) => [type, [...keys]]));
 /**
- * Escapes every regex-special character in `value` so it can be embedded
- * literally inside a `RegExp` source string. Used by
- * {@link stripPositionPrefix} to build a filename-specific prefix pattern
- * without the filename's own characters (e.g. `.` in `b.sh`, or any
- * sandbox-path characters) being interpreted as regex metacharacters.
- */
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-/**
- * Strips mvdan/sh's own `<filename>:<line>:<col>: ` prefix from a
- * `ShParseError.message`, if present. mvdan/sh's `.message` is its own
- * formatted error string (`sh-ast`'s `parse.ts` passes
- * `result.parseError.message` to `ShParseError` verbatim — see that file's
- * doc comment), which already embeds the same `filename:line:col` ESLint's
- * own fatal-message header prints from `FileError.line`/`.column` — see
- * issue #36. Left un-stripped, ESLint's console formatter (and any other
- * consumer that reads `message.message`) shows the position twice and
- * exposes the sandbox-absolute `file.path` a second time inside the message
- * body.
- *
- * Only strips a prefix that names *this exact* `filename` (escaped, so the
- * filename's own characters can't be misread as regex syntax), matched
- * against `\d+:\d+` for line/column — mvdan/sh's message uses its own raw
- * byte column, which is not always numerically identical to
- * `ShParseError.column` (UTF-16-converted; see `ShParseErrorInfo.column`'s
- * doc comment). A message that doesn't start with that exact prefix (e.g.
- * mvdan/sh changes its format, or `filename` doesn't appear verbatim) is
- * returned unchanged rather than mangled.
+ * Strip the exact upstream filename/position prefix ESLint renders separately.
+ * Upstream formats saturated line/column components as `?`; the source byte
+ * offset can still provide an exact UTF-16 location independently of that text.
  */
 function stripPositionPrefix(message, filename) {
-    const prefixPattern = new RegExp(`^${escapeRegExp(filename)}:\\d+:\\d+:\\s*`);
-    return message.replace(prefixPattern, '');
+    const escaped = filename.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return message.replace(new RegExp(`^${escaped}:(?:\\d+|\\?):(?:\\d+|\\?):\\s*`), '');
 }
-/**
- * Converts a caught `parseSync` failure into the `FileError` ESLint expects
- * from a `NotOkParseResult`. A `ShParseError` carries mvdan/sh's *real*
- * reported position (`.line`/`.column`, already UTF-16 — see
- * `sh-ast`'s `ShParseError` doc comment) and is used verbatim;
- * this is the fix for the retired spike's known flaw (`spike/language.mjs`
- * hardcoded `{ line: 1, column: 1 }` for every parse failure, discarding the
- * position mvdan/sh actually reported). The message text has its duplicated
- * `filename:line:col:` prefix stripped (see {@link stripPositionPrefix}) —
- * ESLint already renders that position from `.line`/`.column` in its own
- * fatal-message header, so embedding it again in the message body is both
- * noisy and, for absolute `file.path` values, an unwanted disclosure of the
- * sandbox-absolute path (issue #36).
- *
- * Any other error reaching here (`ShInvalidDialectError` — unreachable in
- * practice, since `validateLanguageOptions` rejects a bad dialect before
- * ESLint ever calls `parse()`; or `ShInternalError` — a shim contract
- * violation) has no real source position to report, so `1:1` is used as an
- * explicit, honest fallback for the "no position available" case — not a
- * stand-in for an actual parse error's position.
- */
-function toFileError(error) {
-    if (error instanceof ShParseError) {
+/** Preserve actual syntax positions while converting byte offsets into this source's UTF-16 diagnostics. */
+function toFileError(error, source) {
+    if (error instanceof ParseError || error instanceof LangError) {
+        const filename = typeof error.Filename === 'string'
+            ? error.Filename
+            : new TextDecoder('utf-8', { fatal: true }).decode(error.Filename);
+        const location = error.Pos.IsValid && !error.Pos.IsRecovered
+            ? new SourceCoordinates(source).fromByteOffset(error.Pos.Offset)
+            : { line: 1, column: 1 };
         return {
-            message: stripPositionPrefix(error.message, error.filename),
-            line: error.line,
-            column: error.column,
+            message: stripPositionPrefix(error.message, filename),
+            line: location.line,
+            column: location.column,
         };
     }
-    const message = error instanceof ShAstError || error instanceof Error ? error.message : String(error);
-    return { message, line: 1, column: 1 };
+    // Bridge/input failures carry no asserted syntax position. The fallback is an ESLint presentation policy.
+    return { message: error instanceof Error ? error.message : String(error), line: 1, column: 1 };
 }
 /**
  * `ShellLanguage` — the `@eslint/core` `Language` implementation for shell
- * scripts (design/ARCHITECTURE.md, "SourceCode and Language objects";
- * design/PACKAGES.md, `@eslint-sh/eslint-plugin`). Registered by the plugin
- * as `languages.sh`, so consumers select it via `language: "sh/sh"`.
+ * scripts. Registered by the plugin as `languages.sh`, so consumers select
+ * it via `language: "sh/sh"`.
  *
  * Implements `matchesSelectorClass` (the six launch esquery selector
  * classes — see `./selector-classes.js`), so rules and end users can write
@@ -130,8 +92,7 @@ export class ShellLanguage {
      * needed there, but `:loop :command` is) match a whole family of node
      * types instead of one literal type name. Delegates to
      * `./selector-classes.js`'s `SELECTOR_CLASS_NODE_TYPES` table for the six
-     * launch classes (design/ARCHITECTURE.md, "SourceCode and Language
-     * objects"); `ancestry` is unused today because none of the six launch
+     * launch classes; `ancestry` is unused today because none of the six launch
      * classes need ancestor context, but the parameter is accepted to match
      * `Language.matchesSelectorClass`'s signature exactly.
      */
@@ -140,21 +101,26 @@ export class ShellLanguage {
     }
     /**
      * Parses `file.body` (guaranteed to be a `string`, since `fileType` is
-     * `"text"`) via `sh-ast`'s `parseSync`, mapping the result to
+     * `"text"`) with one synchronous parse and its original-position snapshot,
+     * mapping the result to
      * the `{ok: true, ast}` / `{ok: false, errors}` shape `Language.parse` is
      * required to return. Never throws — parse failures are reported as
-     * fatal lint messages, per the `Language` contract
-     * (design/ARCHITECTURE.md, "Parse errors and dialects").
+     * fatal lint messages, per the `Language` contract.
      */
     parse(file, context) {
         const text = file.body;
         const dialect = context.languageOptions.dialect ?? 'bash';
         try {
-            const ast = parseSync(text, { dialect, filename: file.path });
+            const parsed = parseWithPositionsSync(text, {
+                Variant: DIALECT_VARIANTS[dialect],
+                Filename: file.path,
+                KeepComments: true,
+            });
+            const ast = adaptSyntaxFile(parsed.File, text, parsed.Positions);
             return { ok: true, ast };
         }
         catch (error) {
-            return { ok: false, errors: [toFileError(error)] };
+            return { ok: false, errors: [toFileError(error, text)] };
         }
     }
     /**

package/dist/language/shell-language.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell-language.js","sourceRoot":"","sources":["../../src/language/shell-language.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shell-language.js","sourceRoot":"","sources":["../../src/language/shell-language.ts"],"names":[],"mappings":"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"}

package/dist/language/shell-source-code.d.ts

@@ -1,14 +1,13 @@
 import { TextSourceCodeBase } from '@eslint/plugin-kit';
-import type { ShFile, ShNode, ShNodes } from 'sh-ast';
+import type { ShellFile as ShFile, ShellNode as ShNode, ShellComment } from './syntax-view.js';
 import type { Directive as IDirective, FileProblem, RulesConfig, SourceLocation, TraversalStep } from '@eslint/core';
 import type { ShellLanguageOptions } from './shell-language-options.js';
 /**
  * `ShellSourceCode` — the `SourceCode` object ESLint uses to work with a
- * parsed shell file (design/ARCHITECTURE.md, "SourceCode and Language
- * objects"). Extends `@eslint/plugin-kit`'s `TextSourceCodeBase`, which
+ * parsed shell file. Extends `@eslint/plugin-kit`'s `TextSourceCodeBase`, which
  * already implements `getLoc`/`getRange`/`getText`/`lines` (both by reading
  * the normalized node's own `loc`/`range` fields — see
- * `sh-ast`'s "Normalized node shape"), `getLocFromIndex`, and
+ * the consumer's source-view contract), `getLocFromIndex`, and
  * `getIndexFromLoc`; this class adds the two members the base class
  * deliberately leaves unimplemented: `traverse()` (base throws "Not
  * implemented") and `getParent()` (base throws "Not implemented", and
@@ -20,7 +19,7 @@ import type { ShellLanguageOptions } from './shell-language-options.js';
  * (`<prefix>-disable`, `<prefix>-enable`, `<prefix>-disable-line`,
  * `<prefix>-disable-next-line`) plus whole-file inline rule config
  * (bare `<prefix> <rule-config>`), sourced from `Comment` nodes gathered via
- * `sh-ast`'s structural `walk()` and parsed with
+ * the consumer's `walkShell()` and parsed with
  * `@eslint/plugin-kit`'s `ConfigCommentParser` — the same building blocks
  * `@eslint/json`'s `JSONSourceCode` uses, generalized so the `<prefix>` is
  * configurable (default `"eslint"`; see `ShellLanguageOptions.directivePrefix`)
@@ -36,7 +35,7 @@ export declare class ShellSourceCode extends TextSourceCodeBase<{
     LangOptions: ShellLanguageOptions;
     RootNode: ShFile;
     SyntaxElementWithLoc: ShNode;
-    ConfigNode: ShNodes.ShCommentNode;
+    ConfigNode: ShellComment;
 }> {
     #private;
     constructor(options: {
@@ -53,17 +52,9 @@ export declare class ShellSourceCode extends TextSourceCodeBase<{
      */
     getParent(node: ShNode): ShNode | undefined;
     /**
-     * Traverses the AST pre-order, yielding a `VisitNodeStep` on node enter
-     * (`phase: 1`) and another on node exit (`phase: 2`) for every node —
-     * exactly the two-phase shape `@eslint/json`/`@eslint/css` produce, which
-     * is what lets rule listeners use `NodeType` and `NodeType:exit` esquery
-     * selectors. Children are discovered via `sh-ast`'s generated,
-     * frozen `visitorKeys` table (per node `type`) — **not** structurally
-     * (contrast `sh-ast`'s own `walk()`, which deliberately walks
-     * structurally so its correctness never depends on that table) — because
-     * ESLint's traversal contract is defined in terms of a language's
-     * declared `visitorKeys`, and this class's whole job is to honor that
-     * contract for shell ASTs.
+     * Produces the enter/exit steps ESLint uses for selectors and ancestor lookup.
+     * Child keys describe the consumer view, including its auxiliary records.
+     * This callback protocol is ESLint's, independent of upstream syntax.Walk.
      */
     traverse(): Iterable<TraversalStep>;
     /**
@@ -74,7 +65,7 @@ export declare class ShellSourceCode extends TextSourceCodeBase<{
      * effect" when `linterOptions.noInlineConfig` is set — see
      * `eslint`'s `lib/linter/linter.js`, the `warnInlineConfig` branch).
      */
-    getInlineConfigNodes(): ShNodes.ShCommentNode[];
+    getInlineConfigNodes(): ShellComment[];
     /**
      * Returns the disable/enable directives found among
      * {@link ShellSourceCode.getInlineConfigNodes}'s comments, recognizing all four forms —
@@ -106,7 +97,7 @@ export declare class ShellSourceCode extends TextSourceCodeBase<{
      * calling this method — and `getDisableDirectives`, together, since both
      * are gated by the same flag in `eslint`'s own `linter.js` — and instead
      * calls `getInlineConfigNodes` to emit a "has no effect" warning per
-     * comment; see design/ARCHITECTURE.md, "SourceCode and Language objects").
+     * comment).
      */
     applyInlineConfig(): {
         configs: {

package/dist/language/shell-source-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-source-code.d.ts","sourceRoot":"","sources":["../../src/language/shell-source-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EACV,SAAS,IAAI,UAAU,EAEvB,WAAW,EACX,WAAW,EACX,cAAc,EACd,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAuExE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC;IACtD,WAAW,EAAE,oBAAoB,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC;CACnC,CAAC;;gBAwDY,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE;IAU5E;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C;;;;;;;;;;;;OAYG;IACH,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC;IAoEnC;;;;;;;OAOG;IACH,oBAAoB,IAAI,OAAO,CAAC,aAAa,EAAE;IAO/C;;;;;;;;;;;;;;;;OAgBG;IACH,oBAAoB,IAAI;QAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;KAAE;IA0B7E;;;;;;;;;;;OAWG;IACH,iBAAiB,IAAI;QACnB,OAAO,EAAE;YAAE,MAAM,EAAE;gBAAE,KAAK,EAAE,WAAW,CAAA;aAAE,CAAC;YAAC,GAAG,EAAE,cAAc,CAAA;SAAE,EAAE,CAAC;QACnE,QAAQ,EAAE,WAAW,EAAE,CAAC;KACzB;CAqBF"}
+{"version":3,"file":"shell-source-code.d.ts","sourceRoot":"","sources":["../../src/language/shell-source-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,SAAS,IAAI,MAAM,EAAE,SAAS,IAAI,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,KAAK,EACV,SAAS,IAAI,UAAU,EAEvB,WAAW,EACX,WAAW,EACX,cAAc,EACd,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AA+MxE;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,eAAgB,SAAQ,kBAAkB,CAAC;IACtD,WAAW,EAAE,oBAAoB,CAAC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,YAAY,CAAC;CAC1B,CAAC;;gBAkDY,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE;IAU5E;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C;;;;OAIG;IACH,QAAQ,IAAI,QAAQ,CAAC,aAAa,CAAC;IAuDnC;;;;;;;OAOG;IACH,oBAAoB,IAAI,YAAY,EAAE;IAOtC;;;;;;;;;;;;;;;;OAgBG;IACH,oBAAoB,IAAI;QAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;KAAE;IA0B7E;;;;;;;;;;;OAWG;IACH,iBAAiB,IAAI;QACnB,OAAO,EAAE;YAAE,MAAM,EAAE;gBAAE,KAAK,EAAE,WAAW,CAAA;aAAE,CAAC;YAAC,GAAG,EAAE,cAAc,CAAA;SAAE,EAAE,CAAC;QACnE,QAAQ,EAAE,WAAW,EAAE,CAAC;KACzB;CAqBF"}