ESM migration: Add .js extensions for node16 moduleResolution (#257)
Migrate expressions, workflow-parser, and languageservice packages to use proper ESM imports with .js extensions that work with node16 moduleResolution. Changes: - Update tsconfig.build.json in each package to use module: node16 and moduleResolution: node16 - Add .js extensions to all relative import paths (Option B approach) - Fix yaml internal type imports in workflow-parser by defining local types - Add skipLibCheck to handle @types/node compatibility issues - Add TypeScript 5.8.3 override in root package.json - Add ESM migration plan documentation The languageserver package is deferred due to test hang issues that need further investigation. Related #154 - Upgrade moduleResolution from node to node16 or nodenext Related #110 - Published ESM code has imports without file extensions Related #64 - expressions: ERR_MODULE_NOT_FOUND attempting to run example Related #146 - Can not import @actions/workflow-parser Test results: - expressions: 1068 tests passed - workflow-parser: 292 tests passed - languageservice: 452 tests passed * docs: update ESM migration plan with findings - Update languageserver blocker: vscode-languageserver v8.0.2 lacks ESM exports (not a test hang issue) - Document that Option B (manual .js extensions) was chosen over Option A due to ts-jest compatibility issues - Add workaround for yaml package internal types (LinePos, NodeBase) - Update migration status table with accurate reason for deferral - Add skipLibCheck note for @types/node compatibility
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||
import {StringToken} from "./templates/tokens";
|
||||
import {isBasicExpression, isString} from "./templates/tokens/type-guards";
|
||||
import {nullTrace} from "./test-utils/null-trace";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser";
|
||||
import {StringToken} from "./templates/tokens/index.js";
|
||||
import {isBasicExpression, isString} from "./templates/tokens/type-guards.js";
|
||||
import {nullTrace} from "./test-utils/null-trace.js";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser.js";
|
||||
|
||||
describe("Workflow Expression Parsing", () => {
|
||||
it("preserves original expressions when building format", () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {TemplateValidationError} from "./templates/template-validation-error";
|
||||
import {nullTrace} from "./test-utils/null-trace";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser";
|
||||
import {TemplateValidationError} from "./templates/template-validation-error.js";
|
||||
import {nullTrace} from "./test-utils/null-trace.js";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser.js";
|
||||
|
||||
describe("parseWorkflow", () => {
|
||||
it("parses valid workflow", () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export {convertWorkflowTemplate} from "./model/convert";
|
||||
export {WorkflowTemplate} from "./model/workflow-template";
|
||||
export * from "./templates/tokens/type-guards";
|
||||
export {NoOperationTraceWriter, TraceWriter} from "./templates/trace-writer";
|
||||
export {parseWorkflow, ParseWorkflowResult} from "./workflows/workflow-parser";
|
||||
export {convertWorkflowTemplate} from "./model/convert.js";
|
||||
export {WorkflowTemplate} from "./model/workflow-template.js";
|
||||
export * from "./templates/tokens/type-guards.js";
|
||||
export {NoOperationTraceWriter, TraceWriter} from "./templates/trace-writer.js";
|
||||
export {parseWorkflow, ParseWorkflowResult} from "./workflows/workflow-parser.js";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||
import {nullTrace} from "../test-utils/null-trace";
|
||||
import {parseWorkflow} from "../workflows/workflow-parser";
|
||||
import {convertWorkflowTemplate, ErrorPolicy} from "./convert";
|
||||
import {nullTrace} from "../test-utils/null-trace.js";
|
||||
import {parseWorkflow} from "../workflows/workflow-parser.js";
|
||||
import {convertWorkflowTemplate, ErrorPolicy} from "./convert.js";
|
||||
|
||||
function serializeTemplate(template: unknown): unknown {
|
||||
return JSON.parse(JSON.stringify(template));
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import {TemplateContext} from "../templates/template-context";
|
||||
import {TemplateToken, TemplateTokenError} from "../templates/tokens/template-token";
|
||||
import {FileProvider} from "../workflows/file-provider";
|
||||
import {parseFileReference} from "../workflows/file-reference";
|
||||
import {parseWorkflow} from "../workflows/workflow-parser";
|
||||
import {convertConcurrency} from "./converter/concurrency";
|
||||
import {convertOn} from "./converter/events";
|
||||
import {handleTemplateTokenErrors} from "./converter/handle-errors";
|
||||
import {convertJobs} from "./converter/jobs";
|
||||
import {convertReferencedWorkflow} from "./converter/referencedWorkflow";
|
||||
import {isReusableWorkflowJob} from "./type-guards";
|
||||
import {WorkflowTemplate} from "./workflow-template";
|
||||
import {TemplateContext} from "../templates/template-context.js";
|
||||
import {TemplateToken, TemplateTokenError} from "../templates/tokens/template-token.js";
|
||||
import {FileProvider} from "../workflows/file-provider.js";
|
||||
import {parseFileReference} from "../workflows/file-reference.js";
|
||||
import {parseWorkflow} from "../workflows/workflow-parser.js";
|
||||
import {convertConcurrency} from "./converter/concurrency.js";
|
||||
import {convertOn} from "./converter/events.js";
|
||||
import {handleTemplateTokenErrors} from "./converter/handle-errors.js";
|
||||
import {convertJobs} from "./converter/jobs.js";
|
||||
import {convertReferencedWorkflow} from "./converter/referencedWorkflow.js";
|
||||
import {isReusableWorkflowJob} from "./type-guards.js";
|
||||
import {WorkflowTemplate} from "./workflow-template.js";
|
||||
|
||||
export enum ErrorPolicy {
|
||||
ReturnErrorsOnly,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token";
|
||||
import {isString} from "../../templates/tokens/type-guards";
|
||||
import {ConcurrencySetting} from "../workflow-template";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token.js";
|
||||
import {isString} from "../../templates/tokens/type-guards.js";
|
||||
import {ConcurrencySetting} from "../workflow-template.js";
|
||||
|
||||
export function convertConcurrency(context: TemplateContext, token: TemplateToken): ConcurrencySetting {
|
||||
const result: ConcurrencySetting = {};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {MappingToken, SequenceToken, StringToken, TemplateToken} from "../../templates/tokens";
|
||||
import {isString} from "../../templates/tokens/type-guards";
|
||||
import {Container, Credential} from "../workflow-template";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {MappingToken, SequenceToken, StringToken, TemplateToken} from "../../templates/tokens/index.js";
|
||||
import {isString} from "../../templates/tokens/type-guards.js";
|
||||
import {Container, Credential} from "../workflow-template.js";
|
||||
|
||||
export function convertToJobContainer(context: TemplateContext, container: TemplateToken): Container | undefined {
|
||||
let image: StringToken | undefined;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {isValidCron, getCronDescription, hasCronIntervalLessThan5Minutes} from "./cron";
|
||||
import {isValidCron, getCronDescription, hasCronIntervalLessThan5Minutes} from "./cron.js";
|
||||
|
||||
describe("cron", () => {
|
||||
describe("valid cron", () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import cronstrue from "cronstrue";
|
||||
|
||||
import {MONTH_RANGE, HOUR_RANGE, MINUTE_RANGE, DOM_RANGE, DOW_RANGE} from "./cron-constants";
|
||||
import {MONTH_RANGE, HOUR_RANGE, MINUTE_RANGE, DOM_RANGE, DOW_RANGE} from "./cron-constants.js";
|
||||
|
||||
type Range = {
|
||||
min: number;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {MappingToken} from "../../templates/tokens/mapping-token";
|
||||
import {SequenceToken} from "../../templates/tokens/sequence-token";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token";
|
||||
import {isLiteral, isMapping, isSequence, isString} from "../../templates/tokens/type-guards";
|
||||
import {TokenType} from "../../templates/tokens/types";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {MappingToken} from "../../templates/tokens/mapping-token.js";
|
||||
import {SequenceToken} from "../../templates/tokens/sequence-token.js";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token.js";
|
||||
import {isLiteral, isMapping, isSequence, isString} from "../../templates/tokens/type-guards.js";
|
||||
import {TokenType} from "../../templates/tokens/types.js";
|
||||
import {
|
||||
BranchFilterConfig,
|
||||
EventsConfig,
|
||||
@@ -14,11 +14,11 @@ import {
|
||||
TypesFilterConfig,
|
||||
VersionsFilterConfig,
|
||||
WorkflowFilterConfig
|
||||
} from "../workflow-template";
|
||||
import {isValidCron} from "./cron";
|
||||
import {convertStringList} from "./string-list";
|
||||
import {convertEventWorkflowCall} from "./workflow-call";
|
||||
import {convertEventWorkflowDispatchInputs} from "./workflow-dispatch";
|
||||
} from "../workflow-template.js";
|
||||
import {isValidCron} from "./cron.js";
|
||||
import {convertStringList} from "./string-list.js";
|
||||
import {convertEventWorkflowCall} from "./workflow-call.js";
|
||||
import {convertEventWorkflowDispatchInputs} from "./workflow-dispatch.js";
|
||||
|
||||
export function convertOn(context: TemplateContext, token: TemplateToken): EventsConfig {
|
||||
if (isLiteral(token)) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {TemplateToken, TemplateTokenError} from "../../templates/tokens/template-token";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {TemplateToken, TemplateTokenError} from "../../templates/tokens/template-token.js";
|
||||
|
||||
export function handleTemplateTokenErrors<TResult>(
|
||||
root: TemplateToken,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {IdBuilder} from "./id-builder";
|
||||
import {IdBuilder} from "./id-builder.js";
|
||||
|
||||
function build(...segments: string[]): string {
|
||||
const builder = new IdBuilder();
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {Lexer, Parser} from "@actions/expressions";
|
||||
import {Binary, Expr, FunctionCall, Grouping, IndexAccess, Logical, Unary} from "@actions/expressions/ast";
|
||||
import {DefinitionInfo} from "../../templates/schema/definition-info";
|
||||
import {splitAllowedContext} from "../../templates/allowed-context";
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {BasicExpressionToken, ExpressionToken, TemplateToken} from "../../templates/tokens";
|
||||
import {DefinitionInfo} from "../../templates/schema/definition-info.js";
|
||||
import {splitAllowedContext} from "../../templates/allowed-context.js";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {BasicExpressionToken, ExpressionToken, TemplateToken} from "../../templates/tokens/index.js";
|
||||
|
||||
/**
|
||||
* Ensures a condition expression contains a status function call.
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {BasicExpressionToken, MappingToken, ScalarToken, StringToken, TemplateToken} from "../../templates/tokens";
|
||||
import {isSequence, isString} from "../../templates/tokens/type-guards";
|
||||
import {Step, WorkflowJob} from "../workflow-template";
|
||||
import {convertToIfCondition} from "./if-condition";
|
||||
import {convertConcurrency} from "./concurrency";
|
||||
import {convertToJobContainer, convertToJobServices} from "./container";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors";
|
||||
import {IdBuilder} from "./id-builder";
|
||||
import {convertToActionsEnvironmentRef} from "./job/environment";
|
||||
import {convertRunsOn} from "./job/runs-on";
|
||||
import {convertSteps} from "./steps";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {
|
||||
BasicExpressionToken,
|
||||
MappingToken,
|
||||
ScalarToken,
|
||||
StringToken,
|
||||
TemplateToken
|
||||
} from "../../templates/tokens/index.js";
|
||||
import {isSequence, isString} from "../../templates/tokens/type-guards.js";
|
||||
import {Step, WorkflowJob} from "../workflow-template.js";
|
||||
import {convertToIfCondition} from "./if-condition.js";
|
||||
import {convertConcurrency} from "./concurrency.js";
|
||||
import {convertToJobContainer, convertToJobServices} from "./container.js";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors.js";
|
||||
import {IdBuilder} from "./id-builder.js";
|
||||
import {convertToActionsEnvironmentRef} from "./job/environment.js";
|
||||
import {convertRunsOn} from "./job/runs-on.js";
|
||||
import {convertSteps} from "./steps.js";
|
||||
|
||||
export function convertJob(context: TemplateContext, jobKey: StringToken, token: MappingToken): WorkflowJob {
|
||||
const error = new IdBuilder().tryAddKnownId(jobKey.value);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateContext} from "../../../templates/template-context";
|
||||
import {TemplateToken} from "../../../templates/tokens/template-token";
|
||||
import {isScalar} from "../../../templates/tokens/type-guards";
|
||||
import {ActionsEnvironmentReference} from "../../workflow-template";
|
||||
import {TemplateContext} from "../../../templates/template-context.js";
|
||||
import {TemplateToken} from "../../../templates/tokens/template-token.js";
|
||||
import {isScalar} from "../../../templates/tokens/type-guards.js";
|
||||
import {ActionsEnvironmentReference} from "../../workflow-template.js";
|
||||
|
||||
export function convertToActionsEnvironmentRef(
|
||||
context: TemplateContext,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {TemplateContext} from "../../../templates/template-context";
|
||||
import {MappingToken, TemplateToken} from "../../../templates/tokens";
|
||||
import {ReusableWorkflowJob} from "../../workflow-template";
|
||||
import {TemplateContext} from "../../../templates/template-context.js";
|
||||
import {MappingToken, TemplateToken} from "../../../templates/tokens/index.js";
|
||||
import {ReusableWorkflowJob} from "../../workflow-template.js";
|
||||
|
||||
type TokenMap = Map<string, [key: string, value: TemplateToken]>;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {TemplateContext} from "../../../templates/template-context";
|
||||
import {TemplateToken} from "../../../templates/tokens";
|
||||
import {isMapping, isString, isSequence} from "../../../templates/tokens/type-guards";
|
||||
import {TemplateContext} from "../../../templates/template-context.js";
|
||||
import {TemplateToken} from "../../../templates/tokens/index.js";
|
||||
import {isMapping, isString, isSequence} from "../../../templates/tokens/type-guards.js";
|
||||
|
||||
type RunsOn = {
|
||||
labels: Set<string>;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateContext} from "../../../templates/template-context";
|
||||
import {NullToken} from "../../../templates/tokens";
|
||||
import {ReusableWorkflowJob} from "../../workflow-template";
|
||||
import {createTokenMap} from "./inputs";
|
||||
import {TemplateContext} from "../../../templates/template-context.js";
|
||||
import {NullToken} from "../../../templates/tokens/index.js";
|
||||
import {ReusableWorkflowJob} from "../../workflow-template.js";
|
||||
import {createTokenMap} from "./inputs.js";
|
||||
|
||||
export function convertWorkflowJobSecrets(context: TemplateContext, job: ReusableWorkflowJob) {
|
||||
// No validation if job passes all secrets
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {StringToken} from "../../templates/tokens";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token";
|
||||
import {isMapping} from "../../templates/tokens/type-guards";
|
||||
import {WorkflowJob} from "../workflow-template";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors";
|
||||
import {convertJob} from "./job";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {StringToken} from "../../templates/tokens/index.js";
|
||||
import {TemplateToken} from "../../templates/tokens/template-token.js";
|
||||
import {isMapping} from "../../templates/tokens/type-guards.js";
|
||||
import {WorkflowJob} from "../workflow-template.js";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors.js";
|
||||
import {convertJob} from "./job.js";
|
||||
|
||||
type nodeInfo = {
|
||||
name: string;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {TemplateToken} from "../../templates/tokens";
|
||||
import {TokenType} from "../../templates/tokens/types";
|
||||
import {ReusableWorkflowJob} from "../workflow-template";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors";
|
||||
import {convertWorkflowJobInputs} from "./job/inputs";
|
||||
import {convertWorkflowJobSecrets} from "./job/secrets";
|
||||
import {convertJobs} from "./jobs";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {TemplateToken} from "../../templates/tokens/index.js";
|
||||
import {TokenType} from "../../templates/tokens/types.js";
|
||||
import {ReusableWorkflowJob} from "../workflow-template.js";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors.js";
|
||||
import {convertWorkflowJobInputs} from "./job/inputs.js";
|
||||
import {convertWorkflowJobSecrets} from "./job/secrets.js";
|
||||
import {convertJobs} from "./jobs.js";
|
||||
|
||||
export function convertReferencedWorkflow(
|
||||
context: TemplateContext,
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {BasicExpressionToken, MappingToken, ScalarToken, StringToken, TemplateToken} from "../../templates/tokens";
|
||||
import {isSequence} from "../../templates/tokens/type-guards";
|
||||
import {isActionStep} from "../type-guards";
|
||||
import {convertToIfCondition} from "./if-condition";
|
||||
import {ActionStep, Step} from "../workflow-template";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors";
|
||||
import {IdBuilder} from "./id-builder";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {
|
||||
BasicExpressionToken,
|
||||
MappingToken,
|
||||
ScalarToken,
|
||||
StringToken,
|
||||
TemplateToken
|
||||
} from "../../templates/tokens/index.js";
|
||||
import {isSequence} from "../../templates/tokens/type-guards.js";
|
||||
import {isActionStep} from "../type-guards.js";
|
||||
import {convertToIfCondition} from "./if-condition.js";
|
||||
import {ActionStep, Step} from "../workflow-template.js";
|
||||
import {handleTemplateTokenErrors} from "./handle-errors.js";
|
||||
import {IdBuilder} from "./id-builder.js";
|
||||
|
||||
export function convertSteps(context: TemplateContext, steps: TemplateToken): Step[] {
|
||||
if (!isSequence(steps)) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {SequenceToken} from "../../templates/tokens/sequence-token";
|
||||
import {SequenceToken} from "../../templates/tokens/sequence-token.js";
|
||||
|
||||
export function convertStringList(name: string, token: SequenceToken): string[] {
|
||||
const result = [] as string[];
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {MappingToken, TemplateToken} from "../../templates/tokens";
|
||||
import {isMapping} from "../../templates/tokens/type-guards";
|
||||
import {SecretConfig, WorkflowCallConfig, InputConfig, InputType} from "../workflow-template";
|
||||
import {convertStringList} from "./string-list";
|
||||
import {ScalarToken} from "../../templates/tokens/scalar-token";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {MappingToken, TemplateToken} from "../../templates/tokens/index.js";
|
||||
import {isMapping} from "../../templates/tokens/type-guards.js";
|
||||
import {SecretConfig, WorkflowCallConfig, InputConfig, InputType} from "../workflow-template.js";
|
||||
import {convertStringList} from "./string-list.js";
|
||||
import {ScalarToken} from "../../templates/tokens/scalar-token.js";
|
||||
|
||||
export function convertEventWorkflowCall(context: TemplateContext, token: MappingToken): WorkflowCallConfig {
|
||||
const result: WorkflowCallConfig = {};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {TemplateContext} from "../../templates/template-context";
|
||||
import {MappingToken} from "../../templates/tokens/mapping-token";
|
||||
import {ScalarToken} from "../../templates/tokens/scalar-token";
|
||||
import {InputConfig, InputType, WorkflowDispatchConfig} from "../workflow-template";
|
||||
import {convertStringList} from "./string-list";
|
||||
import {TemplateContext} from "../../templates/template-context.js";
|
||||
import {MappingToken} from "../../templates/tokens/mapping-token.js";
|
||||
import {ScalarToken} from "../../templates/tokens/scalar-token.js";
|
||||
import {InputConfig, InputType, WorkflowDispatchConfig} from "../workflow-template.js";
|
||||
import {convertStringList} from "./string-list.js";
|
||||
|
||||
export function convertEventWorkflowDispatchInputs(
|
||||
context: TemplateContext,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {ActionStep, Job, ReusableWorkflowJob, RunStep, Step, WorkflowJob} from "./workflow-template";
|
||||
import {ActionStep, Job, ReusableWorkflowJob, RunStep, Step, WorkflowJob} from "./workflow-template.js";
|
||||
|
||||
export function isRunStep(step: Step): step is RunStep {
|
||||
return (step as RunStep).run !== undefined;
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
SequenceToken,
|
||||
StringToken,
|
||||
TemplateToken
|
||||
} from "../templates/tokens";
|
||||
} from "../templates/tokens/index.js";
|
||||
|
||||
export type WorkflowTemplate = {
|
||||
events: EventsConfig;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {FunctionInfo} from "@actions/expressions/funcs/info";
|
||||
import {MAX_CONSTANT} from "./template-constants";
|
||||
import {MAX_CONSTANT} from "./template-constants.js";
|
||||
|
||||
export function splitAllowedContext(allowedContext: string[]): {
|
||||
namedContexts: string[];
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
import {ObjectReader} from "./object-reader";
|
||||
import {EventType, ParseEvent} from "./parse-event";
|
||||
import {LiteralToken, SequenceToken, MappingToken, NullToken, BooleanToken, NumberToken, StringToken} from "./tokens";
|
||||
import {ObjectReader} from "./object-reader.js";
|
||||
import {EventType, ParseEvent} from "./parse-event.js";
|
||||
import {
|
||||
LiteralToken,
|
||||
SequenceToken,
|
||||
MappingToken,
|
||||
NullToken,
|
||||
BooleanToken,
|
||||
NumberToken,
|
||||
StringToken
|
||||
} from "./tokens/index.js";
|
||||
|
||||
export class JSONObjectReader implements ObjectReader {
|
||||
private readonly _fileId: number | undefined;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {LiteralToken, SequenceToken, MappingToken} from "./tokens";
|
||||
import {LiteralToken, SequenceToken, MappingToken} from "./tokens/index.js";
|
||||
|
||||
/**
|
||||
* Interface for reading a source object (or file).
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {TemplateToken} from "./tokens";
|
||||
import {TemplateToken} from "./tokens/index.js";
|
||||
|
||||
export class ParseEvent {
|
||||
public readonly type: EventType;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {DEFINITION, BOOLEAN} from "../template-constants";
|
||||
import {MappingToken, LiteralToken} from "../tokens";
|
||||
import {TokenType} from "../tokens/types";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {DEFINITION, BOOLEAN} from "../template-constants.js";
|
||||
import {MappingToken, LiteralToken} from "../tokens/index.js";
|
||||
import {TokenType} from "../tokens/types.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
|
||||
export class BooleanDefinition extends ScalarDefinition {
|
||||
public constructor(key: string, definition?: MappingToken) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateSchema} from ".";
|
||||
import {Definition} from "./definition";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {TemplateSchema} from "./index.js";
|
||||
import {Definition} from "./definition.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
|
||||
export class DefinitionInfo {
|
||||
private readonly _schema: TemplateSchema;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {CONTEXT, DEFINITION, DESCRIPTION} from "../template-constants";
|
||||
import {MappingToken} from "../tokens";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {TemplateSchema} from "./template-schema";
|
||||
import {CONTEXT, DEFINITION, DESCRIPTION} from "../template-constants.js";
|
||||
import {MappingToken} from "../tokens/index.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {TemplateSchema} from "./template-schema.js";
|
||||
|
||||
/**
|
||||
* Defines the allowable schema for a user defined type
|
||||
|
||||
@@ -1 +1 @@
|
||||
export {TemplateSchema} from "./template-schema";
|
||||
export {TemplateSchema} from "./template-schema.js";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {TemplateSchema} from "./template-schema";
|
||||
import {DEFINITION, MAPPING, PROPERTIES, LOOSE_KEY_TYPE, LOOSE_VALUE_TYPE} from "../template-constants";
|
||||
import {MappingToken} from "../tokens";
|
||||
import {Definition} from "./definition";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {PropertyDefinition} from "./property-definition";
|
||||
import {TemplateSchema} from "./template-schema.js";
|
||||
import {DEFINITION, MAPPING, PROPERTIES, LOOSE_KEY_TYPE, LOOSE_VALUE_TYPE} from "../template-constants.js";
|
||||
import {MappingToken} from "../tokens/index.js";
|
||||
import {Definition} from "./definition.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {PropertyDefinition} from "./property-definition.js";
|
||||
|
||||
export class MappingDefinition extends Definition {
|
||||
public readonly properties: {[key: string]: PropertyDefinition} = {};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {DEFINITION, NULL} from "../template-constants";
|
||||
import {MappingToken, LiteralToken} from "../tokens";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {TokenType} from "../tokens/types";
|
||||
import {DEFINITION, NULL} from "../template-constants.js";
|
||||
import {MappingToken, LiteralToken} from "../tokens/index.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
import {TokenType} from "../tokens/types.js";
|
||||
|
||||
export class NullDefinition extends ScalarDefinition {
|
||||
public constructor(key: string, definition?: MappingToken) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {DEFINITION, NUMBER} from "../template-constants";
|
||||
import {MappingToken, LiteralToken} from "../tokens";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {TokenType} from "../tokens/types";
|
||||
import {DEFINITION, NUMBER} from "../template-constants.js";
|
||||
import {MappingToken, LiteralToken} from "../tokens/index.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
import {TokenType} from "../tokens/types.js";
|
||||
|
||||
export class NumberDefinition extends ScalarDefinition {
|
||||
public constructor(key: string, definition?: MappingToken) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {TemplateSchema} from "./template-schema";
|
||||
import {TemplateSchema} from "./template-schema.js";
|
||||
import {
|
||||
DEFINITION,
|
||||
ONE_OF,
|
||||
@@ -10,17 +10,17 @@ import {
|
||||
CONSTANT,
|
||||
LOOSE_KEY_TYPE,
|
||||
ALLOWED_VALUES
|
||||
} from "../template-constants";
|
||||
import {MappingToken} from "../tokens";
|
||||
import {BooleanDefinition} from "./boolean-definition";
|
||||
import {Definition} from "./definition";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {MappingDefinition} from "./mapping-definition";
|
||||
import {NullDefinition} from "./null-definition";
|
||||
import {NumberDefinition} from "./number-definition";
|
||||
import {SequenceDefinition} from "./sequence-definition";
|
||||
import {StringDefinition} from "./string-definition";
|
||||
import {PropertyDefinition} from "./property-definition";
|
||||
} from "../template-constants.js";
|
||||
import {MappingToken} from "../tokens/index.js";
|
||||
import {BooleanDefinition} from "./boolean-definition.js";
|
||||
import {Definition} from "./definition.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {MappingDefinition} from "./mapping-definition.js";
|
||||
import {NullDefinition} from "./null-definition.js";
|
||||
import {NumberDefinition} from "./number-definition.js";
|
||||
import {SequenceDefinition} from "./sequence-definition.js";
|
||||
import {StringDefinition} from "./string-definition.js";
|
||||
import {PropertyDefinition} from "./property-definition.js";
|
||||
|
||||
/**
|
||||
* Must resolve to exactly one of the referenced definitions
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {MAPPING_PROPERTY_VALUE, TYPE, REQUIRED, DESCRIPTION} from "../template-constants";
|
||||
import {TemplateToken, StringToken} from "../tokens";
|
||||
import {TokenType} from "../tokens/types";
|
||||
import {MAPPING_PROPERTY_VALUE, TYPE, REQUIRED, DESCRIPTION} from "../template-constants.js";
|
||||
import {TemplateToken, StringToken} from "../tokens/index.js";
|
||||
import {TokenType} from "../tokens/types.js";
|
||||
|
||||
export class PropertyDefinition {
|
||||
public readonly type: string = "";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {LiteralToken, MappingToken} from "../tokens";
|
||||
import {Definition} from "./definition";
|
||||
import {LiteralToken, MappingToken} from "../tokens/index.js";
|
||||
import {Definition} from "./definition.js";
|
||||
|
||||
export abstract class ScalarDefinition extends Definition {
|
||||
public constructor(key: string, definition?: MappingToken) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {DEFINITION, SEQUENCE, ITEM_TYPE} from "../template-constants";
|
||||
import {MappingToken} from "../tokens";
|
||||
import {Definition} from "./definition";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {TemplateSchema} from "./template-schema";
|
||||
import {DEFINITION, SEQUENCE, ITEM_TYPE} from "../template-constants.js";
|
||||
import {MappingToken} from "../tokens/index.js";
|
||||
import {Definition} from "./definition.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {TemplateSchema} from "./template-schema.js";
|
||||
|
||||
export class SequenceDefinition extends Definition {
|
||||
public itemType = "";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {CONSTANT, DEFINITION, IGNORE_CASE, IS_EXPRESSION, REQUIRE_NON_EMPTY, STRING} from "../template-constants";
|
||||
import {LiteralToken, MappingToken, StringToken} from "../tokens";
|
||||
import {TokenType} from "../tokens/types";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {CONSTANT, DEFINITION, IGNORE_CASE, IS_EXPRESSION, REQUIRE_NON_EMPTY, STRING} from "../template-constants.js";
|
||||
import {LiteralToken, MappingToken, StringToken} from "../tokens/index.js";
|
||||
import {TokenType} from "../tokens/types.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
|
||||
export class StringDefinition extends ScalarDefinition {
|
||||
public constant = "";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {TokenType} from "../../templates/tokens/types";
|
||||
import {ObjectReader} from "../object-reader";
|
||||
import {TokenType} from "../../templates/tokens/types.js";
|
||||
import {ObjectReader} from "../object-reader.js";
|
||||
import {
|
||||
ALLOWED_VALUES,
|
||||
ANY,
|
||||
@@ -43,22 +43,22 @@ import {
|
||||
TEMPLATE_SCHEMA,
|
||||
TYPE,
|
||||
VERSION
|
||||
} from "../template-constants";
|
||||
import {TemplateContext, TemplateValidationErrors} from "../template-context";
|
||||
import {readTemplate} from "../template-reader";
|
||||
import {MappingToken, SequenceToken, StringToken} from "../tokens";
|
||||
import {NoOperationTraceWriter} from "../trace-writer";
|
||||
import {BooleanDefinition} from "./boolean-definition";
|
||||
import {Definition} from "./definition";
|
||||
import {DefinitionType} from "./definition-type";
|
||||
import {MappingDefinition} from "./mapping-definition";
|
||||
import {NullDefinition} from "./null-definition";
|
||||
import {NumberDefinition} from "./number-definition";
|
||||
import {OneOfDefinition} from "./one-of-definition";
|
||||
import {PropertyDefinition} from "./property-definition";
|
||||
import {ScalarDefinition} from "./scalar-definition";
|
||||
import {SequenceDefinition} from "./sequence-definition";
|
||||
import {StringDefinition} from "./string-definition";
|
||||
} from "../template-constants.js";
|
||||
import {TemplateContext, TemplateValidationErrors} from "../template-context.js";
|
||||
import {readTemplate} from "../template-reader.js";
|
||||
import {MappingToken, SequenceToken, StringToken} from "../tokens/index.js";
|
||||
import {NoOperationTraceWriter} from "../trace-writer.js";
|
||||
import {BooleanDefinition} from "./boolean-definition.js";
|
||||
import {Definition} from "./definition.js";
|
||||
import {DefinitionType} from "./definition-type.js";
|
||||
import {MappingDefinition} from "./mapping-definition.js";
|
||||
import {NullDefinition} from "./null-definition.js";
|
||||
import {NumberDefinition} from "./number-definition.js";
|
||||
import {OneOfDefinition} from "./one-of-definition.js";
|
||||
import {PropertyDefinition} from "./property-definition.js";
|
||||
import {ScalarDefinition} from "./scalar-definition.js";
|
||||
import {SequenceDefinition} from "./sequence-definition.js";
|
||||
import {StringDefinition} from "./string-definition.js";
|
||||
|
||||
/**
|
||||
* This models the root schema object and contains definitions
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import {FunctionInfo} from "@actions/expressions/funcs/info";
|
||||
|
||||
import {TemplateSchema} from "./schema/template-schema";
|
||||
import {TemplateValidationError} from "./template-validation-error";
|
||||
import {TemplateToken} from "./tokens";
|
||||
import {TokenRange} from "./tokens/token-range";
|
||||
import {TraceWriter} from "./trace-writer";
|
||||
import {TemplateSchema} from "./schema/template-schema.js";
|
||||
import {TemplateValidationError} from "./template-validation-error.js";
|
||||
import {TemplateToken} from "./tokens/index.js";
|
||||
import {TokenRange} from "./tokens/token-range.js";
|
||||
import {TraceWriter} from "./trace-writer.js";
|
||||
/**
|
||||
* Context object that is flowed through while loading and evaluating object templates
|
||||
*/
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
// template-reader *just* does schema validation
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
||||
|
||||
import {ObjectReader} from "./object-reader";
|
||||
import {TemplateSchema} from "./schema";
|
||||
import {DefinitionInfo} from "./schema/definition-info";
|
||||
import {DefinitionType} from "./schema/definition-type";
|
||||
import {MappingDefinition} from "./schema/mapping-definition";
|
||||
import {ScalarDefinition} from "./schema/scalar-definition";
|
||||
import {SequenceDefinition} from "./schema/sequence-definition";
|
||||
import {ANY, CLOSE_EXPRESSION, INSERT_DIRECTIVE, OPEN_EXPRESSION} from "./template-constants";
|
||||
import {TemplateContext} from "./template-context";
|
||||
import {ObjectReader} from "./object-reader.js";
|
||||
import {TemplateSchema} from "./schema/index.js";
|
||||
import {DefinitionInfo} from "./schema/definition-info.js";
|
||||
import {DefinitionType} from "./schema/definition-type.js";
|
||||
import {MappingDefinition} from "./schema/mapping-definition.js";
|
||||
import {ScalarDefinition} from "./schema/scalar-definition.js";
|
||||
import {SequenceDefinition} from "./schema/sequence-definition.js";
|
||||
import {ANY, CLOSE_EXPRESSION, INSERT_DIRECTIVE, OPEN_EXPRESSION} from "./template-constants.js";
|
||||
import {TemplateContext} from "./template-context.js";
|
||||
import {
|
||||
BasicExpressionToken,
|
||||
ExpressionToken,
|
||||
@@ -19,10 +19,10 @@ import {
|
||||
ScalarToken,
|
||||
StringToken,
|
||||
TemplateToken
|
||||
} from "./tokens";
|
||||
import {TokenRange} from "./tokens/token-range";
|
||||
import {isString} from "./tokens/type-guards";
|
||||
import {TokenType} from "./tokens/types";
|
||||
} from "./tokens/index.js";
|
||||
import {TokenRange} from "./tokens/token-range.js";
|
||||
import {isString} from "./tokens/type-guards.js";
|
||||
import {TokenType} from "./tokens/types.js";
|
||||
|
||||
const WHITESPACE_PATTERN = /\s/;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {TokenRange} from "./tokens/token-range";
|
||||
import {TokenRange} from "./tokens/token-range.js";
|
||||
|
||||
/**
|
||||
* Provides information about an error which occurred during validation
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
|
||||
import {CLOSE_EXPRESSION, OPEN_EXPRESSION} from "../template-constants";
|
||||
import {ExpressionToken} from "./expression-token";
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {SerializedExpressionToken} from "./serialization";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {CLOSE_EXPRESSION, OPEN_EXPRESSION} from "../template-constants.js";
|
||||
import {ExpressionToken} from "./expression-token.js";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {SerializedExpressionToken} from "./serialization.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class BasicExpressionToken extends ExpressionToken {
|
||||
private readonly expr: string;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {LiteralToken, TemplateToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {LiteralToken, TemplateToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class BooleanToken extends LiteralToken {
|
||||
private readonly bool: boolean;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {Lexer, Parser} from "@actions/expressions";
|
||||
import {splitAllowedContext} from "../allowed-context";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {splitAllowedContext} from "../allowed-context.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
|
||||
export abstract class ExpressionToken extends ScalarToken {
|
||||
public readonly directive: string | undefined;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
export {TemplateToken} from "./template-token";
|
||||
export {ScalarToken} from "./scalar-token";
|
||||
export {LiteralToken} from "./literal-token";
|
||||
export {StringToken} from "./string-token";
|
||||
export {NumberToken} from "./number-token";
|
||||
export {BooleanToken} from "./boolean-token";
|
||||
export {NullToken} from "./null-token";
|
||||
export {KeyValuePair} from "./key-value-pair";
|
||||
export {SequenceToken} from "./sequence-token";
|
||||
export {MappingToken} from "./mapping-token";
|
||||
export {ExpressionToken} from "./expression-token";
|
||||
export {BasicExpressionToken} from "./basic-expression-token";
|
||||
export {InsertExpressionToken} from "./insert-expression-token";
|
||||
export {TemplateToken} from "./template-token.js";
|
||||
export {ScalarToken} from "./scalar-token.js";
|
||||
export {LiteralToken} from "./literal-token.js";
|
||||
export {StringToken} from "./string-token.js";
|
||||
export {NumberToken} from "./number-token.js";
|
||||
export {BooleanToken} from "./boolean-token.js";
|
||||
export {NullToken} from "./null-token.js";
|
||||
export {KeyValuePair} from "./key-value-pair.js";
|
||||
export {SequenceToken} from "./sequence-token.js";
|
||||
export {MappingToken} from "./mapping-token.js";
|
||||
export {ExpressionToken} from "./expression-token.js";
|
||||
export {BasicExpressionToken} from "./basic-expression-token.js";
|
||||
export {InsertExpressionToken} from "./insert-expression-token.js";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {TemplateToken, ScalarToken, ExpressionToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {INSERT_DIRECTIVE, OPEN_EXPRESSION, CLOSE_EXPRESSION} from "../template-constants";
|
||||
import {SerializedExpressionToken} from "./serialization";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {TemplateToken, ScalarToken, ExpressionToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {INSERT_DIRECTIVE, OPEN_EXPRESSION, CLOSE_EXPRESSION} from "../template-constants.js";
|
||||
import {SerializedExpressionToken} from "./serialization.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class InsertExpressionToken extends ExpressionToken {
|
||||
public constructor(
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
|
||||
export class KeyValuePair {
|
||||
public readonly key: ScalarToken;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
|
||||
export abstract class LiteralToken extends ScalarToken {
|
||||
public constructor(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {TemplateToken, KeyValuePair, ScalarToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {MapItem, SerializedToken} from "./serialization";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {TemplateToken, KeyValuePair, ScalarToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {MapItem, SerializedToken} from "./serialization.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class MappingToken extends TemplateToken {
|
||||
private readonly map: KeyValuePair[] = [];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {LiteralToken, TemplateToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {LiteralToken, TemplateToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class NullToken extends LiteralToken {
|
||||
public constructor(
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {LiteralToken, TemplateToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {LiteralToken, TemplateToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class NumberToken extends LiteralToken {
|
||||
private readonly num: number;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
|
||||
/**
|
||||
* Base class for everything that is not a mapping or sequence
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import {TemplateToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {SerializedSequenceToken} from "./serialization";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {TemplateToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {SerializedSequenceToken} from "./serialization.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class SequenceToken extends TemplateToken {
|
||||
private readonly seq: TemplateToken[] = [];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {TokenType} from "./types";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export type MapItem = {
|
||||
Key: ScalarToken;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {LiteralToken, TemplateToken} from ".";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TokenType} from "./types";
|
||||
import {LiteralToken, TemplateToken} from "./index.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class StringToken extends LiteralToken {
|
||||
public readonly value: string;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/* eslint-disable @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion */
|
||||
import {nullTrace} from "../../test-utils/null-trace";
|
||||
import {parseWorkflow} from "../../workflows/workflow-parser";
|
||||
import {StringToken} from "./string-token";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {nullTrace} from "../../test-utils/null-trace.js";
|
||||
import {parseWorkflow} from "../../workflows/workflow-parser.js";
|
||||
import {StringToken} from "./string-token.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
|
||||
describe("traverse", () => {
|
||||
it("returns parent token and key", () => {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import {BooleanToken, MappingToken, NullToken, NumberToken, ScalarToken, SequenceToken, StringToken} from ".";
|
||||
import {Definition} from "../schema/definition";
|
||||
import {DefinitionInfo} from "../schema/definition-info";
|
||||
import {PropertyDefinition} from "../schema/property-definition";
|
||||
import {SerializedToken} from "./serialization";
|
||||
import {TokenRange} from "./token-range";
|
||||
import {TraversalState} from "./traversal-state";
|
||||
import {TokenType, tokenTypeName} from "./types";
|
||||
import {BooleanToken, MappingToken, NullToken, NumberToken, ScalarToken, SequenceToken, StringToken} from "./index.js";
|
||||
import {Definition} from "../schema/definition.js";
|
||||
import {DefinitionInfo} from "../schema/definition-info.js";
|
||||
import {PropertyDefinition} from "../schema/property-definition.js";
|
||||
import {SerializedToken} from "./serialization.js";
|
||||
import {TokenRange} from "./token-range.js";
|
||||
import {TraversalState} from "./traversal-state.js";
|
||||
import {TokenType, tokenTypeName} from "./types.js";
|
||||
|
||||
export class TemplateTokenError extends Error {
|
||||
constructor(message: string, public readonly token?: TemplateToken) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {TemplateToken} from ".";
|
||||
import {MappingToken} from "./mapping-token";
|
||||
import {SequenceToken} from "./sequence-token";
|
||||
import {TokenType} from "./types";
|
||||
import {TemplateToken} from "./index.js";
|
||||
import {MappingToken} from "./mapping-token.js";
|
||||
import {SequenceToken} from "./sequence-token.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export class TraversalState {
|
||||
private readonly _token: TemplateToken;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import {BasicExpressionToken} from "./basic-expression-token";
|
||||
import {BooleanToken} from "./boolean-token";
|
||||
import {LiteralToken} from "./literal-token";
|
||||
import {MappingToken} from "./mapping-token";
|
||||
import {NumberToken} from "./number-token";
|
||||
import {ScalarToken} from "./scalar-token";
|
||||
import {SequenceToken} from "./sequence-token";
|
||||
import {StringToken} from "./string-token";
|
||||
import {TemplateToken} from "./template-token";
|
||||
import {TokenType} from "./types";
|
||||
import {BasicExpressionToken} from "./basic-expression-token.js";
|
||||
import {BooleanToken} from "./boolean-token.js";
|
||||
import {LiteralToken} from "./literal-token.js";
|
||||
import {MappingToken} from "./mapping-token.js";
|
||||
import {NumberToken} from "./number-token.js";
|
||||
import {ScalarToken} from "./scalar-token.js";
|
||||
import {SequenceToken} from "./sequence-token.js";
|
||||
import {StringToken} from "./string-token.js";
|
||||
import {TemplateToken} from "./template-token.js";
|
||||
import {TokenType} from "./types.js";
|
||||
|
||||
export function isLiteral(t: TemplateToken): t is LiteralToken {
|
||||
return t.isLiteral;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
import {NoOperationTraceWriter} from "../templates/trace-writer";
|
||||
import {NoOperationTraceWriter} from "../templates/trace-writer.js";
|
||||
|
||||
export const nullTrace = new NoOperationTraceWriter();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {File} from "./file";
|
||||
import {FileReference} from "./file-reference";
|
||||
import {File} from "./file.js";
|
||||
import {FileReference} from "./file-reference.js";
|
||||
|
||||
export interface FileProvider {
|
||||
getFileContent(ref: FileReference): Promise<File>;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {parseFileReference} from "./file-reference";
|
||||
import {parseFileReference} from "./file-reference.js";
|
||||
|
||||
describe("parseFileReference", () => {
|
||||
it("parses local file reference", () => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {parseWorkflow} from "./workflow-parser";
|
||||
import {nullTrace} from "../test-utils/null-trace";
|
||||
import {parseWorkflow} from "./workflow-parser.js";
|
||||
import {nullTrace} from "../test-utils/null-trace.js";
|
||||
|
||||
it("The template is not read when there are YAML errors", () => {
|
||||
const content = `
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import {TemplateContext, TemplateValidationErrors} from "../templates/template-context";
|
||||
import * as templateReader from "../templates/template-reader";
|
||||
import {TemplateToken} from "../templates/tokens/template-token";
|
||||
import {TraceWriter} from "../templates/trace-writer";
|
||||
import {File} from "./file";
|
||||
import {WORKFLOW_ROOT} from "./workflow-constants";
|
||||
import {getWorkflowSchema} from "./workflow-schema";
|
||||
import {YamlObjectReader} from "./yaml-object-reader";
|
||||
import {TemplateContext, TemplateValidationErrors} from "../templates/template-context.js";
|
||||
import * as templateReader from "../templates/template-reader.js";
|
||||
import {TemplateToken} from "../templates/tokens/template-token.js";
|
||||
import {TraceWriter} from "../templates/trace-writer.js";
|
||||
import {File} from "./file.js";
|
||||
import {WORKFLOW_ROOT} from "./workflow-constants.js";
|
||||
import {getWorkflowSchema} from "./workflow-schema.js";
|
||||
import {YamlObjectReader} from "./yaml-object-reader.js";
|
||||
export interface ParseWorkflowResult {
|
||||
context: TemplateContext;
|
||||
value: TemplateToken | undefined;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import {JSONObjectReader} from "../templates/json-object-reader";
|
||||
import {TemplateSchema} from "../templates/schema";
|
||||
import {JSONObjectReader} from "../templates/json-object-reader.js";
|
||||
import {TemplateSchema} from "../templates/schema/index.js";
|
||||
import WorkflowSchema from "../workflow-v1.0.min.json";
|
||||
|
||||
let schema: TemplateSchema;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import {TemplateContext, TemplateValidationErrors} from "../templates/template-context";
|
||||
import {TemplateToken} from "../templates/tokens";
|
||||
import {TokenType} from "../templates/tokens/types";
|
||||
import {nullTrace} from "../test-utils/null-trace";
|
||||
import {parseWorkflow} from "./workflow-parser";
|
||||
import {getWorkflowSchema} from "./workflow-schema";
|
||||
import {YamlObjectReader} from "./yaml-object-reader";
|
||||
import {TemplateContext, TemplateValidationErrors} from "../templates/template-context.js";
|
||||
import {TemplateToken} from "../templates/tokens/index.js";
|
||||
import {TokenType} from "../templates/tokens/types.js";
|
||||
import {nullTrace} from "../test-utils/null-trace.js";
|
||||
import {parseWorkflow} from "./workflow-parser.js";
|
||||
import {getWorkflowSchema} from "./workflow-schema.js";
|
||||
import {YamlObjectReader} from "./yaml-object-reader.js";
|
||||
|
||||
describe("getLiteralToken", () => {
|
||||
it("non-zero number", () => {
|
||||
|
||||
@@ -11,10 +11,8 @@ import {
|
||||
Scalar
|
||||
} from "yaml";
|
||||
import type {Document} from "yaml";
|
||||
import type {LinePos} from "yaml/dist/errors";
|
||||
import type {NodeBase} from "yaml/dist/nodes/Node";
|
||||
import {ObjectReader} from "../templates/object-reader";
|
||||
import {EventType, ParseEvent} from "../templates/parse-event";
|
||||
import {ObjectReader} from "../templates/object-reader.js";
|
||||
import {EventType, ParseEvent} from "../templates/parse-event.js";
|
||||
import {
|
||||
BooleanToken,
|
||||
LiteralToken,
|
||||
@@ -23,8 +21,12 @@ import {
|
||||
NumberToken,
|
||||
SequenceToken,
|
||||
StringToken
|
||||
} from "../templates/tokens/index";
|
||||
import {Position, TokenRange} from "../templates/tokens/token-range";
|
||||
} from "../templates/tokens/index.js";
|
||||
import {Position, TokenRange} from "../templates/tokens/token-range.js";
|
||||
|
||||
// Internal yaml types - defined locally since yaml package doesn't export them
|
||||
type LinePos = {line: number; col: number};
|
||||
type NodeBase = {range?: [number, number, number] | null};
|
||||
|
||||
export type YamlError = {
|
||||
message: string;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import * as fs from "fs";
|
||||
import * as path from "path";
|
||||
import * as YAML from "yaml";
|
||||
import {convertWorkflowTemplate} from "./model/convert";
|
||||
import {NoOperationTraceWriter} from "./templates/trace-writer";
|
||||
import {File} from "./workflows/file";
|
||||
import {FileProvider} from "./workflows/file-provider";
|
||||
import {fileIdentifier, FileReference} from "./workflows/file-reference";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser";
|
||||
import {convertWorkflowTemplate} from "./model/convert.js";
|
||||
import {NoOperationTraceWriter} from "./templates/trace-writer.js";
|
||||
import {File} from "./workflows/file.js";
|
||||
import {FileProvider} from "./workflows/file-provider.js";
|
||||
import {fileIdentifier, FileReference} from "./workflows/file-reference.js";
|
||||
import {parseWorkflow} from "./workflows/workflow-parser.js";
|
||||
|
||||
interface TestOptions {
|
||||
"include-source"?: boolean;
|
||||
|
||||
Reference in New Issue
Block a user