export datatype classes, update examples

examples/svelte-counter/src/App.svelte

@@ -1,11 +1,14 @@
 <script lang="ts">
   import svelteLogo from "./assets/svelte.svg"
   import automergeLogo from "/automerge-logo.svg"
-  import { next as automerge } from "@automerge/automerge"
   import Counter from "./lib/Counter.svelte"
   import type { DocType } from "./lib/doc-type"
 
-  import { Repo, isValidAutomergeUrl } from "@automerge/automerge-repo"
+  import {
+    Counter as AutomergeCounter,
+    Repo,
+    isValidAutomergeUrl,
+  } from "@automerge/automerge-repo"
   import { BroadcastChannelNetworkAdapter } from "@automerge/automerge-repo-network-broadcastchannel"
   import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb"
   import { BrowserWebSocketClientAdapter } from "@automerge/automerge-repo-network-websocket"
@@ -21,15 +24,15 @@
 
   setContextRepo(repo)
 
-const rootDocUrl = `${document.location.hash.substring(1)}`
-let handle
-if (isValidAutomergeUrl(rootDocUrl)) {
-  handle = repo.find(rootDocUrl)
-} else {
-  handle = repo.create<DocType>({ count: new automerge.Counter() })
-}
+  const rootDocUrl = `${document.location.hash.substring(1)}`
+  let handle
+  if (isValidAutomergeUrl(rootDocUrl)) {
+    handle = repo.find(rootDocUrl)
+  } else {
+    handle = repo.create<DocType>({ count: new AutomergeCounter() })
+  }
 
-const docUrl = (document.location.hash = handle.url)
+  const docUrl = (document.location.hash = handle.url)
 </script>
 
 <main>

examples/svelte-counter/src/lib/Counter.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
-  import {document} from "@automerge/automerge-repo-svelte-store"
-  import {type AutomergeUrl} from "@automerge/automerge-repo"
-  import type {DocType} from "./doc-type"
+  import { document } from "@automerge/automerge-repo-svelte-store"
+  import { type AutomergeUrl } from "@automerge/automerge-repo"
+  import type { DocType } from "./doc-type"
 
   export let documentUrl: AutomergeUrl
 
-  const doc = document <DocType> (documentUrl)
+  const doc = document<DocType>(documentUrl)
   const increment = () => {
     doc.change(d => {
       d.count.increment(1)

examples/svelte-counter/src/lib/doc-type.ts

@@ -1,4 +1,4 @@
-import type { Counter } from "@automerge/automerge"
+import type { Counter } from "@automerge/automerge-repo"
 
 export type DocType = {
   count: Counter

packages/automerge-repo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "A repository object to manage a collection of automerge documents",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo",
   "author": "Peter van Hardenberg <[email protected]>",

packages/automerge-repo/src/index.ts

@@ -92,7 +92,7 @@ export type {
 export * from "./types.js"
 
 // export commonly used data types
-export type { Counter, RawString, Cursor } from "@automerge/automerge/next"
+export { Counter, RawString, Cursor } from "@automerge/automerge/next"
 
 // export some automerge API types
 export type {

packages/create-repo-node-app/src/index.ts

@@ -32,7 +32,6 @@ function createIndexJs(projectName: string) {
   const indexJsContent = `import { Repo } from "@automerge/automerge-repo"
 import { BrowserWebSocketClientAdapter } from "@automerge/automerge-repo-network-websocket"
 import { NodeFSStorageAdapter } from "@automerge/automerge-repo-storage-nodefs"
-import { next as Automerge } from "@automerge/automerge"
 
 const repo = new Repo({
   storage: new NodeFSStorageAdapter("./db"),

packages/create-vite-app/template/src/App.tsx

@@ -1,11 +1,10 @@
 import automergeLogo from "./assets/automerge.png"
 import "./App.css"
-import { AutomergeUrl } from "@automerge/automerge-repo"
+import { AutomergeUrl, Counter } from "@automerge/automerge-repo"
 import { useDocument } from "@automerge/automerge-repo-react-hooks"
-import { next as A } from "@automerge/automerge"
 
 interface CounterDoc {
-  counter: A.Counter
+  counter: Counter
 }
 
 function App({ docUrl }: { docUrl: AutomergeUrl }) {

packages/create-vite-app/template/src/main.tsx

@@ -1,9 +1,8 @@
-import { isValidAutomergeUrl, Repo } from "@automerge/automerge-repo"
+import { isValidAutomergeUrl, Repo, Counter } from "@automerge/automerge-repo"
 import { BrowserWebSocketClientAdapter } from "@automerge/automerge-repo-network-websocket"
 import { BroadcastChannelNetworkAdapter } from "@automerge/automerge-repo-network-broadcastchannel"
 import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb"
 import { RepoContext } from "@automerge/automerge-repo-react-hooks"
-import { next as A } from "@automerge/automerge" //why `next`? See the the "next" section of the conceptual overview
 import React from "react"
 import ReactDOM from "react-dom/client"
 import App from "./App.tsx"
@@ -22,8 +21,8 @@ let handle
 if (isValidAutomergeUrl(rootDocUrl)) {
   handle = repo.find(rootDocUrl)
 } else {
-  handle = repo.create<{ counter?: A.Counter }>()
-  handle.change(d => (d.counter = new A.Counter()))
+  handle = repo.create<{ counter?: Counter }>()
+  handle.change(d => (d.counter = new Counter()))
 }
 const docUrl = (document.location.hash = handle.url)
 // @ts-expect-error -- we put the handle and the repo on window so you can experiment with them from the dev tools