Skip to content

Commit

Permalink
Fix import orders and lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Ekrekr committed Nov 20, 2023
1 parent 81297ed commit 3dd1e0f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { compile as compiler } from "df/core/compilers";
import { main } from "df/core/main";
import { Session } from "df/core/session";
import { version } from "df/core/version";
import { dataform } from "df/protos/ts";
import { readWorkflowSettings } from "df/core/workflow_settings";
import { dataform } from "df/protos/ts";

// Create static session object.
// This hack just enforces the singleton session object to
Expand Down
2 changes: 1 addition & 1 deletion core/main.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { decode64, encode64 } from "df/common/protos";
import { Session } from "df/core/session";
import * as utils from "df/core/utils";
import { dataform } from "df/protos/ts";
import { readWorkflowSettings } from "df/core/workflow_settings";
import { dataform } from "df/protos/ts";

/**
* This is the main entry point into the user space code that should be invoked by the compilation wrapper sandbox.
Expand Down
17 changes: 9 additions & 8 deletions core/main_test.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { suite, test } from "df/testing";
import { dataform } from "df/protos/ts";
import * as path from "path";
import * as fs from "fs-extra";
import * as main from "df/core/main";
import { compile } from "df/core/compilers";
import { TmpDirFixture } from "df/testing/fixtures";
import { expect } from "chai";
import * as fs from "fs-extra";
import * as path from "path";
import { CompilerFunction, NodeVM } from "vm2";

import { decode64, encode64 } from "df/common/protos";
import { compile } from "df/core/compilers";
import { dataform } from "df/protos/ts";
import { suite, test } from "df/testing";
import { TmpDirFixture } from "df/testing/fixtures";
import { asPlainObject } from "df/tests/utils";

const VALID_WORKFLOW_SETTINGS_YAML = `
Expand All @@ -22,7 +22,8 @@ const VALID_DATAFORM_JSON = `
}
`;

suite("@dataform/core", ({ beforeEach, afterEach }) => {
// tslint:disable: detect-non-literal-fs-filename
suite("@dataform/core", ({ afterEach }) => {
const tmpDirFixture = new TmpDirFixture(afterEach);

suite("workflow settings", () => {
Expand Down
1 change: 1 addition & 0 deletions core/workflow_settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ function verifyWorkflowSettingsAsJson(workflowSettingsAsJson?: object) {

function maybeRequire(file: string): any {
try {
// tslint:disable-next-line: tsr-detect-non-literal-require
return require(file);
} catch (e) {
if (e instanceof SyntaxError) {
Expand Down

0 comments on commit 3dd1e0f

Please sign in to comment.