refactor(shader-ast): update imports

thi-ng · Feb 24, 2020 · ff6eb70 · ff6eb70
1 parent 6dbea7d
commit ff6eb70
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 108 deletions.
diff --git a/packages/shader-ast/src/api/function.ts b/packages/shader-ast/src/api/function.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Fn,
     Fn0,
     Fn2,
@@ -9,9 +9,9 @@ import {
     Fn7,
     Fn8
 } from "@thi.ng/api";
-import { FnCall, Sym, Term } from "./nodes";
-import { SymOpts } from "./syms";
-import { Type } from "./types";
+import type { FnCall, Sym, Term } from "./nodes";
+import type { SymOpts } from "./syms";
+import type { Type } from "./types";
 
 export type ScopeBody = (Term<any> | null | undefined)[];
 

diff --git a/packages/shader-ast/src/api/nodes.ts b/packages/shader-ast/src/api/nodes.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Func0,
     Func1,
     Func2,
@@ -9,11 +9,11 @@ import {
     Func7,
     Func8
 } from "./function";
-import { Operator } from "./ops";
-import { SymOpts } from "./syms";
-import { Tag } from "./tags";
-import { BoolTerm } from "./terms";
-import {
+import type { Operator } from "./ops";
+import type { SymOpts } from "./syms";
+import type { Tag } from "./tags";
+import type { BoolTerm } from "./terms";
+import type {
     Assignable,
     Indexable,
     Type,

diff --git a/packages/shader-ast/src/api/syms.ts b/packages/shader-ast/src/api/syms.ts
@@ -1,5 +1,5 @@
-import { Sym } from "./nodes";
-import { Precision } from "./precision";
+import type { Sym } from "./nodes";
+import type { Precision } from "./precision";
 
 export type SymQualifier = "in" | "out" | "inout";
 

diff --git a/packages/shader-ast/src/api/target.ts b/packages/shader-ast/src/api/target.ts
@@ -1,5 +1,5 @@
-import { Fn } from "@thi.ng/api";
-import {
+import type { Fn } from "@thi.ng/api";
+import type {
     ArrayInit,
     Assign,
     Branch,
@@ -19,7 +19,7 @@ import {
     Ternary,
     WhileLoop
 } from "./nodes";
-import { Tag } from "./tags";
+import type { Tag } from "./tags";
 
 export interface TargetImpl<T> extends Record<Tag, Fn<any, T>> {
     arg: Fn<FuncArg<any>, T>;

diff --git a/packages/shader-ast/src/api/terms.ts b/packages/shader-ast/src/api/terms.ts
@@ -1,4 +1,4 @@
-import { Term } from "./nodes";
+import type { Term } from "./nodes";
 
 export type BoolTerm = Term<"bool">;
 export type FloatTerm = Term<"float">;

diff --git a/packages/shader-ast/src/api/types.ts b/packages/shader-ast/src/api/types.ts
@@ -1,5 +1,5 @@
-import { Index, Swizzle, Sym } from "./nodes";
-import {
+import type { Index, Swizzle, Sym } from "./nodes";
+import type {
     BoolTerm,
     FloatTerm,
     IntTerm,

diff --git a/packages/shader-ast/src/ast/assign.ts b/packages/shader-ast/src/ast/assign.ts
@@ -1,6 +1,6 @@
 import { assert } from "@thi.ng/api";
-import { Assign, Swizzle, Term } from "../api/nodes";
-import { Assignable, Type } from "../api/types";
+import type { Assign, Swizzle, Term } from "../api/nodes";
+import type { Assignable, Type } from "../api/types";
 
 export const assign = <L extends Type, R extends L>(
     l: Assignable<L>,

diff --git a/packages/shader-ast/src/ast/checks.ts b/packages/shader-ast/src/ast/checks.ts
@@ -1,4 +1,4 @@
-import { Term } from "../api/nodes";
+import type { Term } from "../api/nodes";
 
 const RE_VEC = /^[iub]?vec[234]$/;
 const RE_MAT = /^mat[234]$/;

diff --git a/packages/shader-ast/src/ast/controlflow.ts b/packages/shader-ast/src/ast/controlflow.ts
@@ -1,6 +1,7 @@
-import { FnBody1 } from "..";
-import { Fn } from "@thi.ng/api";
-import {
+import { decl, scope } from "./scope";
+import type { FnBody1 } from "../api/function";
+import type { Fn } from "@thi.ng/api";
+import type {
     Branch,
     ControlFlow,
     ForLoop,
@@ -9,9 +10,8 @@ import {
     Ternary,
     WhileLoop
 } from "../api/nodes";
-import { BoolTerm } from "../api/terms";
-import { Type } from "../api/types";
-import { decl, scope } from "./scope";
+import type { BoolTerm } from "../api/terms";
+import type { Type } from "../api/types";
 
 export const ifThen = (
     test: BoolTerm,

diff --git a/packages/shader-ast/src/ast/function.ts b/packages/shader-ast/src/ast/function.ts
@@ -1,6 +1,14 @@
 import { assert } from "@thi.ng/api";
 import { isString } from "@thi.ng/checks";
+import { gensym } from "./idgen";
 import {
+    allChildren,
+    scope,
+    scopedChildren,
+    walk
+} from "./scope";
+import { sym } from "./sym";
+import type {
     Arg,
     Arg1,
     Arg2,
@@ -21,7 +29,7 @@ import {
     FnBody8,
     ScopeBody
 } from "../api/function";
-import {
+import type {
     FnCall,
     Func,
     FuncArg,
@@ -38,16 +46,8 @@ import {
     TaggedFn8,
     Term
 } from "../api/nodes";
-import { SymOpts } from "../api/syms";
-import { Type } from "../api/types";
-import { gensym } from "./idgen";
-import {
-    allChildren,
-    scope,
-    scopedChildren,
-    walk
-} from "./scope";
-import { sym } from "./sym";
+import type { SymOpts } from "../api/syms";
+import type { Type } from "../api/types";
 
 const defArg = <T extends Type>(a: Arg<T>): FuncArg<T> => {
     const [type, id, opts] = isString(a) ? <[T, string?, SymOpts?]>[a] : a;

diff --git a/packages/shader-ast/src/ast/indexed.ts b/packages/shader-ast/src/ast/indexed.ts
@@ -1,13 +1,13 @@
 import { isNumber } from "@thi.ng/checks";
-import { Index, Sym } from "../api/nodes";
-import { UintTerm } from "../api/terms";
-import {
+import { int } from "./lit";
+import type { Index, Sym } from "../api/nodes";
+import type { UintTerm } from "../api/terms";
+import type {
     Indexable,
     IndexTypeMap,
     MatIndexTypeMap,
     NumericI
 } from "../api/types";
-import { int } from "./lit";
 
 export const index = <T extends Indexable>(
     val: Sym<T>,

diff --git a/packages/shader-ast/src/ast/item.ts b/packages/shader-ast/src/ast/item.ts
@@ -1,13 +1,3 @@
-import { IObjectOf } from "@thi.ng/api";
-import { Term } from "../api/nodes";
-import { FloatTerm } from "../api/terms";
-import {
-    Int,
-    IVec,
-    Prim,
-    Type,
-    UVec
-} from "../api/types";
 import {
     bool,
     float,
@@ -17,6 +7,16 @@ import {
     vec3,
     vec4
 } from "./lit";
+import type { IObjectOf } from "@thi.ng/api";
+import type { Term } from "../api/nodes";
+import type { FloatTerm } from "../api/terms";
+import type {
+    Int,
+    IVec,
+    Prim,
+    Type,
+    UVec
+} from "../api/types";
 
 /**
  * Returns base type for given term. Used for array ops.

diff --git a/packages/shader-ast/src/ast/lit.ts b/packages/shader-ast/src/ast/lit.ts
@@ -1,22 +1,22 @@
-import { Fn } from "@thi.ng/api";
 import { isBoolean, isNumber } from "@thi.ng/checks";
-import { Lit, Term } from "../api/nodes";
-import {
+import { isVec } from "./checks";
+import type { Fn } from "@thi.ng/api";
+import type { Lit, Term } from "../api/nodes";
+import type {
     FloatTerm,
     IntTerm,
     UintTerm,
     Vec2Term,
     Vec3Term,
     Vec4Term
 } from "../api/terms";
-import {
+import type {
     NumericB,
     NumericF,
     NumericI,
     NumericU,
     Type
 } from "../api/types";
-import { isVec } from "./checks";
 
 export const lit = <T extends Type>(
     type: T,

diff --git a/packages/shader-ast/src/ast/ops.ts b/packages/shader-ast/src/ast/ops.ts
@@ -1,13 +1,16 @@
-import { IObjectOf } from "@thi.ng/api";
 import { isNumber } from "@thi.ng/checks";
-import {
+import { isMat, isVec } from "./checks";
+import { numberWithMatchingType } from "./item";
+import { float } from "./lit";
+import type { IObjectOf } from "@thi.ng/api";
+import type {
     Op1,
     Op2,
     Sym,
     Term
 } from "../api/nodes";
-import { ComparisonOperator, Operator } from "../api/ops";
-import {
+import type { ComparisonOperator, Operator } from "../api/ops";
+import type {
     BoolTerm,
     FloatTerm,
     IntTerm,
@@ -19,7 +22,7 @@ import {
     Vec3Term,
     Vec4Term
 } from "../api/terms";
-import {
+import type {
     Comparable,
     Int,
     IVec,
@@ -29,9 +32,6 @@ import {
     UVec,
     Vec
 } from "../api/types";
-import { isMat, isVec } from "./checks";
-import { numberWithMatchingType } from "./item";
-import { float } from "./lit";
 
 export const op1 = <T extends Type>(
     op: Operator,

diff --git a/packages/shader-ast/src/ast/scope.ts b/packages/shader-ast/src/ast/scope.ts
@@ -1,7 +1,8 @@
-import { Fn, Fn2 } from "@thi.ng/api";
 import { isArray } from "@thi.ng/checks";
 import { DGraph } from "@thi.ng/dgraph";
-import {
+import { isMat, isVec } from "./checks";
+import type { Fn, Fn2 } from "@thi.ng/api";
+import type {
     Assign,
     Branch,
     Decl,
@@ -16,8 +17,7 @@ import {
     Term,
     Ternary
 } from "../api/nodes";
-import { Type } from "../api/types";
-import { isMat, isVec } from "./checks";
+import type { Type } from "../api/types";
 
 /**
  * Helper function for {@link walk}. Returns child nodes for any control

diff --git a/packages/shader-ast/src/ast/swizzle.ts b/packages/shader-ast/src/ast/swizzle.ts
@@ -1,6 +1,6 @@
-import { Select4 } from "@thi.ng/api";
-import { Swizzle, Term } from "../api/nodes";
-import {
+import type { Select4 } from "@thi.ng/api";
+import type { Swizzle, Term } from "../api/nodes";
+import type {
     Swizzle2,
     Swizzle2_1,
     Swizzle2_2,
@@ -14,7 +14,7 @@ import {
     Swizzle4_2,
     Swizzle4_3
 } from "../api/swizzles";
-import {
+import type {
     BVec2Term,
     BVec3Term,
     BVec4Term,
@@ -28,7 +28,7 @@ import {
     Vec3Term,
     Vec4Term
 } from "../api/terms";
-import {
+import type {
     BVec,
     IVec,
     Type,

diff --git a/packages/shader-ast/src/ast/sym.ts b/packages/shader-ast/src/ast/sym.ts
@@ -1,10 +1,10 @@
 import { assert } from "@thi.ng/api";
 import { isString } from "@thi.ng/checks";
 import { illegalArgs } from "@thi.ng/errors";
-import { Lit, Sym, Term } from "../api/nodes";
-import { SymOpts } from "../api/syms";
-import { ArrayTypeMap, Type } from "../api/types";
 import { gensym } from "./idgen";
+import type { Lit, Sym, Term } from "../api/nodes";
+import type { SymOpts } from "../api/syms";
+import type { ArrayTypeMap, Type } from "../api/types";
 
 export function sym<T extends Type>(init: Term<T>): Sym<T>;
 export function sym<T extends Type>(type: T): Sym<T>;

diff --git a/packages/shader-ast/src/builtin/bvec.ts b/packages/shader-ast/src/builtin/bvec.ts
@@ -1,6 +1,6 @@
-import { FnCall, Term } from "../api/nodes";
-import { BVec } from "../api/types";
 import { builtinCall } from "../ast/function";
+import type { FnCall, Term } from "../api/nodes";
+import type { BVec } from "../api/types";
 
 const $bvec = (t: string) => <any>("bvec" + t[t.length - 1]);
 

diff --git a/packages/shader-ast/src/builtin/math.ts b/packages/shader-ast/src/builtin/math.ts
@@ -1,5 +1,7 @@
-import { FnCall, Sym, Term } from "../api/nodes";
-import {
+import { builtinCall } from "../ast/function";
+import { matchingBoolType, matchingPrimFor } from "../ast/item";
+import type { FnCall, Sym, Term } from "../api/nodes";
+import type {
     BoolTerm,
     BVec2Term,
     BVec3Term,
@@ -17,9 +19,7 @@ import {
     Vec3Term,
     Vec4Term
 } from "../api/terms";
-import { Mat, Prim, Vec } from "../api/types";
-import { builtinCall } from "../ast/function";
-import { matchingBoolType, matchingPrimFor } from "../ast/item";
+import type { Mat, Prim, Vec } from "../api/types";
 
 const primOp1 = (name: string) => <T extends Prim>(a: Term<T>) =>
     builtinCall(name, a.type, a);