Skip to content

Commit

Permalink
util: Move isSerializationFirstNode to runtime package to resolve…
Browse files Browse the repository at this point in the history
… cyclic dependency
  • Loading branch information
Turbo87 committed Dec 24, 2018
1 parent 41d196d commit ad9a416
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 21 deletions.
7 changes: 6 additions & 1 deletion packages/@glimmer/runtime/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ export {
ElementOperations,
clientBuilder,
} from './lib/vm/element-builder';
export { rehydrationBuilder, RehydrateBuilder } from './lib/vm/rehydrate-builder';
export {
rehydrationBuilder,
RehydrateBuilder,
SERIALIZATION_FIRST_NODE_STRING,
isSerializationFirstNode,
} from './lib/vm/rehydrate-builder';
export { default as Bounds, ConcreteBounds, Cursor } from './lib/bounds';
export { capabilityFlagsFrom, hasCapability, Capability } from './lib/capabilities';
14 changes: 7 additions & 7 deletions packages/@glimmer/runtime/lib/vm/rehydrate-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { NewElementBuilder, ElementBuilder, RemoteBlockTracker } from './element
import { Environment } from '../environment';
import Bounds, { Cursor, ConcreteBounds } from '../bounds';
import { Simple, Option } from '@glimmer/interfaces';
import {
expect,
assert,
Stack,
isSerializationFirstNode,
SERIALIZATION_FIRST_NODE_STRING,
} from '@glimmer/util';
import { expect, assert, Stack } from '@glimmer/util';
import { SVG_NAMESPACE } from '../dom/helper';

export const SERIALIZATION_FIRST_NODE_STRING = '%+b:0%';

export function isSerializationFirstNode(node: Simple.Node): boolean {
return node.nodeValue === SERIALIZATION_FIRST_NODE_STRING;
}

export class RehydratingCursor extends Cursor {
candidate: Option<Simple.Node> = null;
openBlockDepth: number;
Expand Down
5 changes: 0 additions & 5 deletions packages/@glimmer/util/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ export { default as assert } from './lib/assert';
export { assign, fillNulls } from './lib/object-utils';
export { ensureGuid, initializeGuid, HasGuid } from './lib/guid';

export {
isSerializationFirstNode,
SERIALIZATION_FIRST_NODE_STRING,
} from './lib/is-serialization-first-node';

export { Stack, Dict, Set, DictSet, dict } from './lib/collections';
export {
EMPTY_SLICE,
Expand Down
7 changes: 0 additions & 7 deletions packages/@glimmer/util/lib/is-serialization-first-node.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@glimmer/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"@types/qunit": "^2.0.31",
"typescript": "^2.8.3"
}
}
}

0 comments on commit ad9a416

Please sign in to comment.