Skip to content

Commit

Permalink
fix: import all types from /types
Browse files Browse the repository at this point in the history
  • Loading branch information
Johan committed Sep 15, 2019
1 parent d5d672b commit ca89c65
Show file tree
Hide file tree
Showing 31 changed files with 54 additions and 34 deletions.
1 change: 0 additions & 1 deletion src/index.ts
@@ -1,6 +1,5 @@
import { flexi } from "./lib";

export { until } from "./lib/walker";
export * from "./types";

export default flexi;
2 changes: 1 addition & 1 deletion src/lib/flexi.ts
@@ -1,4 +1,4 @@
import { Flexi, Path } from ".";
import { Flexi, Path } from "../types";
import path, { concat, empty, exists, isEmpty, isRoot, root } from "./path";
import { pathString } from "./path/parse";
import walk from "./walker";
Expand Down
3 changes: 1 addition & 2 deletions src/lib/index.ts
@@ -1,3 +1,2 @@
// eslint-disable-next-line
export { default as flexi } from "./flexi";

export * from "../types";
2 changes: 1 addition & 1 deletion src/lib/path/children.ts
@@ -1,4 +1,4 @@
import { ChildQuery, FlexiPath, PathMeta } from "..";
import { ChildQuery, FlexiPath, PathMeta } from "../../types";
import walker from "../walker";
import { concat, readDir } from ".";

Expand Down
3 changes: 2 additions & 1 deletion src/lib/path/concat.ts
@@ -1,6 +1,7 @@
import { join } from "path";

import { flexi, FlexiPath } from "..";
import { flexi } from "..";
import { FlexiPath } from "../../types";

/**
* Concatinates a `path` with other `paths`
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/cut.ts
@@ -1,4 +1,4 @@
import { FlexiPath } from "..";
import { FlexiPath } from "../../types";
import walker from "../walker";
import { depth } from ".";

Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/diff.ts
@@ -1,4 +1,4 @@
import { FlexiPath, Path } from "..";
import { FlexiPath, Path } from "../../types";
import walker from "../walker";
/**
* Get the diff for two paths
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/except.ts
@@ -1,4 +1,4 @@
import { FlexiPath } from "..";
import { FlexiPath } from "../../types";
import { flatReduce } from "./flatten";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/files.ts
@@ -1,4 +1,4 @@
import { FileQuery, FlexiPath, PathType } from "..";
import { FileQuery, FlexiPath, PathType } from "../../types";
import { children } from ".";
/**
* The files in the current `path`
Expand Down
3 changes: 2 additions & 1 deletion src/lib/path/flatten.ts
@@ -1,4 +1,5 @@
import { flexi, FlexiPath, PathMeta } from "..";
import { flexi } from "..";
import { FlexiPath, PathMeta } from "../../types";
import walker from "../walker";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/index.ts
@@ -1,4 +1,4 @@
import { FlexiPath, Path, PathKind, PathMeta } from "..";
import { FlexiPath, Path, PathKind, PathMeta } from "../../types";
import append from "./append";
import children from "./children";
import cut from "./cut";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/intersect.ts
@@ -1,4 +1,4 @@
import { FlexiPath } from "..";
import { FlexiPath } from "../../types";
import { flatReduce } from "./flatten";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/exists.ts
@@ -1,6 +1,6 @@
import { existsSync } from "fs";

import { Path } from "../..";
import { Path } from "../../../types";
import { pathString } from "../parse";
/**
* `boolean` value indicating if the `path` exists or not
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/hasRoot.ts
@@ -1,6 +1,6 @@
import { parse } from "path";

import { Path } from "../..";
import { Path } from "../../../types";
import { constants, pathString } from "../parse";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/index.ts
@@ -1,6 +1,6 @@
import { normalize, parse } from "path";

import { Path, PathMeta } from "../..";
import { Path, PathMeta } from "../../../types";
import { pathString } from "../parse";
import depth from "./depth";
import equals from "./equals";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/isEmpty.ts
@@ -1,4 +1,4 @@
import { Path } from "../..";
import { Path } from "../../../types";
import { constants, pathString } from "../parse";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/isRoot.ts
@@ -1,4 +1,4 @@
import { Path } from "../..";
import { Path } from "../../../types";
import { constants, pathString } from "../parse";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/meta/isValid.ts
@@ -1,6 +1,6 @@
import { parse } from "path";

import { Path } from "../..";
import { Path } from "../../../types";
import { constants, pathString } from "../parse";
/**
* `boolean` value representing if the `path` can be created on the disk
Expand Down
3 changes: 2 additions & 1 deletion src/lib/path/parent.ts
@@ -1,6 +1,7 @@
import { join } from "path";

import { flexi, FlexiPath, ParentQuery, Path, PathMeta } from "..";
import { flexi } from "..";
import { FlexiPath, ParentQuery, Path, PathMeta } from "../../types";
import walker from "../walker";
import { isEmpty, isRoot, parse } from ".";

Expand Down
10 changes: 8 additions & 2 deletions src/lib/path/parse/index.ts
@@ -1,8 +1,14 @@
import { join } from "path";

import path from "..";
import { flexi, FlexiPath, Path, PathWithBasePath } from "../..";
import { PathKind, PathVistor } from "../../../types";
import { flexi } from "../..";
import {
FlexiPath,
Path,
PathKind,
PathVistor,
PathWithBasePath
} from "../../../types";
import pathKind from "./pathKind";

export { default as constants } from "./constants";
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/prepend.ts
@@ -1,4 +1,4 @@
import { FlexiPath } from "..";
import { FlexiPath } from "../../types";
import { concat, parse } from ".";

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/path/reverse.ts
@@ -1,4 +1,4 @@
import { FlexiPath } from "..";
import { FlexiPath } from "../../types";
import { flatten, parse } from ".";

/**
Expand Down
3 changes: 2 additions & 1 deletion src/lib/path/write.ts
@@ -1,6 +1,7 @@
import shell from "shelljs";

import { flexi, FlexiPath, PathType } from "..";
import { flexi } from "..";
import { FlexiPath, PathType } from "../../types";
import { exists, parent, type } from ".";

/**
Expand Down
3 changes: 2 additions & 1 deletion src/lib/walker/back.ts
@@ -1,4 +1,5 @@
import { flexi, FlexiPath, Path, WalkedPath, WalkOptions } from "..";
import { flexi } from "..";
import { FlexiPath, Path, WalkedPath, WalkOptions } from "../../types";
import reporter from "./reporter";

/**
Expand Down
9 changes: 8 additions & 1 deletion src/lib/walker/forward.ts
@@ -1,4 +1,11 @@
import { flexi, FlexiPath, Path, PathType, WalkedPath, WalkOptions } from "..";
import { flexi } from "..";
import {
FlexiPath,
Path,
PathType,
WalkedPath,
WalkOptions
} from "../../types";
import reporter from "./reporter";
/**
* Walks a `path`
Expand Down
2 changes: 1 addition & 1 deletion src/lib/walker/reporter.ts
@@ -1,4 +1,4 @@
import { Path, WalkedState, WalkOptions } from "..";
import { Path, WalkedState, WalkOptions } from "../../types";
import { parse } from "../path";

/**
Expand Down
3 changes: 2 additions & 1 deletion src/lib/walker/until/exists.ts
@@ -1,4 +1,5 @@
import { flexi, PathMeta, WalkUntil } from "../..";
import { flexi } from "../..";
import { PathMeta, WalkUntil } from "../../../types";

/**
* @category walker
Expand Down
4 changes: 2 additions & 2 deletions src/lib/walker/until/sameAs.ts
@@ -1,5 +1,5 @@
import { flexi, Path, PathMeta, WalkUntil } from "../..";

import { flexi } from "../..";
import { Path, PathMeta, WalkUntil } from "../../../types";
/**
* @category walker
*/
Expand Down
3 changes: 2 additions & 1 deletion test/path/children.test.ts
@@ -1,4 +1,5 @@
import flexi, { PathType } from "../../src";
import flexi from "../../src";
import { PathType } from "../../src/types";
import testData from "../jest/createTestData";

describe("path", () => {
Expand Down
3 changes: 2 additions & 1 deletion test/path/defaultstate.test.ts
@@ -1,6 +1,7 @@
import { normalize } from "path";

import flexi, { FlexiPath, PathType } from "../../src";
import flexi from "../../src";
import { FlexiPath, PathType } from "../../src/types";

describe("path", () => {
describe("default state", () => {
Expand Down
3 changes: 2 additions & 1 deletion test/path/parent.test.ts
@@ -1,7 +1,8 @@
import { normalize } from "path";

import flexi, { FlexiPath } from "../../src";
import flexi from "../../src";
import { parent } from "../../src/lib/path";
import { FlexiPath } from "../../src/types";

describe("path", () => {
describe("parent", () => {
Expand Down

0 comments on commit ca89c65

Please sign in to comment.