Merge pull request #177 from oliver-oloughlin/patch/update-imports

Patch/update imports

deno.json

@@ -5,6 +5,17 @@
     ".": "./mod.ts",
     "./ext/zod": "./ext/zod.ts"
   },
+  "imports": {
+    "assert": "jsr:@std/[email protected]/assert",
+    "assert_equals": "jsr:@std/[email protected]/assert_equals",
+    "assert_not_equals": "jsr:@std/[email protected]/assert_not_equals",
+    "assert_throws": "jsr:@std/[email protected]/assert_throws",
+    "ulid": "jsr:@std/[email protected]",
+    "concat": "jsr:@std/[email protected]/concat",
+    "deep_merge": "jsr:@std/[email protected]/deep_merge",
+    "zlib": "node:zlib",
+    "zod": "npm:zod@3"
+  },
   "tasks": {
     "check": "deno check mod.ts src/*.ts ext/*.ts tests/*.ts tests/**/*.ts benchmarks/**/*ts",
     "test": "deno test --allow-write --allow-read --unstable-kv --trace-ops",

ext/zod.ts

@@ -1,5 +1,5 @@
-import { z } from "npm:zod@3.22.4"
-import type { KvArray, KvId, KvObject, KvValue, Model } from "../mod.ts"
+import { z } from "zod"
+import type { KvArray, KvId, KvObject, KvValue, Model } from "../src/types.ts"
 
 /*******************/
 /*                 */

src/atomic_builder.ts

@@ -1,5 +1,5 @@
 import type { Collection } from "./collection.ts"
-import { ulid } from "./deps.ts"
+import { ulid } from "ulid"
 import { InvalidCollectionError } from "./errors.ts"
 import type {
   AtomicCheck,

src/collection.ts

@@ -1,5 +1,6 @@
 import type {
   AtomicListOptions,
+  BuilderFn,
   CheckKeyOf,
   CollectionKeys,
   CollectionOptions,
@@ -78,8 +79,9 @@ import { AtomicWrapper } from "./atomic_wrapper.ts"
 import { AtomicPool } from "./atomic_pool.ts"
 import { Document } from "./document.ts"
 import { model } from "./model.ts"
-import { concat, deepMerge, ulid } from "./deps.ts"
-import { BuilderFn } from "./types.ts"
+import { concat } from "concat"
+import { deepMerge } from "deep_merge"
+import { ulid } from "ulid"
 
 /**
  * Create a new collection within a database context.

src/kvdex.ts

@@ -5,6 +5,7 @@ import type {
   EnqueueOptions,
   FindOptions,
   IntervalMessage,
+  IntervalSetter,
   KvId,
   KvKey,
   KvValue,
@@ -36,7 +37,6 @@ import {
 } from "./constants.ts"
 import { model } from "./model.ts"
 import { AtomicWrapper } from "./atomic_wrapper.ts"
-import { IntervalSetter } from "./types.ts"
 
 /**
  * Create a new database instance.

src/types.ts

@@ -1,5 +1,5 @@
 import type { Collection } from "./collection.ts"
-import type { DeepMergeOptions } from "./deps.ts"
+import type { DeepMergeOptions } from "deep_merge"
 import type { Document } from "./document.ts"
 
 /*********************/

src/utils.ts

@@ -15,12 +15,8 @@ import type {
   PreparedEnqueue,
   QueueMessage,
 } from "./types.ts"
-import {
-  brotliCompressSync,
-  brotliDecompressSync,
-  constants,
-  ulid,
-} from "./deps.ts"
+import { brotliCompressSync, brotliDecompressSync, constants } from "zlib"
+import { ulid } from "ulid"
 
 /*************************/
 /*                       */

tests/collection/add.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1, mockUserInvalid } from "../mocks.ts"
 import { useDb } from "../utils.ts"
 
@@ -22,6 +22,7 @@ Deno.test("collection - add", async (t) => {
         assert(cr.ok)
 
         const doc = await db.z_users.find(cr.id)
+
         assert(doc !== null)
         assert(doc.value.username === mockUser1.username)
       })

tests/collection/addMany.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateInvalidUsers, generateUsers, useDb } from "../utils.ts"
 
 Deno.test("collection - addMany", async (t) => {

tests/collection/count.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateUsers } from "../utils.ts"
 import { useDb } from "../utils.ts"
 

tests/collection/delete.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1 } from "../mocks.ts"
 import { generateUsers, useDb } from "../utils.ts"
 

tests/collection/deleteMany.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateUsers, useDb } from "../utils.ts"
 
 Deno.test("collection - deleteMany", async (t) => {

tests/collection/enqueue.test.ts

@@ -1,6 +1,6 @@
 import { collection, kvdex, KvValue, model, QueueMessage } from "../../mod.ts"
 import { createHandlerId } from "../../src/utils.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { createResolver, useDb, useKv } from "../utils.ts"
 
 Deno.test("collection - enqueue", async (t) => {

tests/collection/find.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1 } from "../mocks.ts"
 import { useDb } from "../utils.ts"
 

tests/collection/findMany.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateUsers, useDb } from "../utils.ts"
 
 Deno.test("collection - findMany", async (t) => {

tests/collection/forEach.test.ts

@@ -1,5 +1,5 @@
 import { Document } from "../../mod.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { User } from "../models.ts"
 import { generateUsers } from "../utils.ts"
 import { useDb } from "../utils.ts"

tests/collection/getMany.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateUsers } from "../utils.ts"
 import { useDb } from "../utils.ts"
 

tests/collection/getOne.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { sleep, useDb } from "../utils.ts"
 import { mockUser1, mockUser2 } from "../mocks.ts"
 

tests/collection/history.test.ts

@@ -1,5 +1,5 @@
 import { collection, kvdex, model } from "../../mod.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { sleep, useKv } from "../utils.ts"
 import { mockUser1, mockUser2, mockUser3 } from "../mocks.ts"
 import type { User } from "../models.ts"

tests/collection/listenQueue.test.ts

@@ -4,7 +4,7 @@ import {
   UNDELIVERED_KEY_PREFIX,
 } from "../../src/constants.ts"
 import { createHandlerId, extendKey } from "../../src/utils.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { createResolver, sleep, useKv } from "../utils.ts"
 
 Deno.test("collection - listenQueue", async (t) => {

tests/collection/map.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { generateUsers } from "../utils.ts"
 import { useDb } from "../utils.ts"
 

tests/collection/properties.test.ts

@@ -1,7 +1,7 @@
 import { collection, Document, kvdex, model } from "../../mod.ts"
 import { ID_KEY_PREFIX, KVDEX_KEY_PREFIX } from "../../src/constants.ts"
 import { extendKey, keyEq } from "../../src/utils.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1 } from "../mocks.ts"
 import { User } from "../models.ts"
 import { generateUsers, useDb, useKv } from "../utils.ts"

tests/collection/set.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1, mockUser2, mockUserInvalid } from "../mocks.ts"
 import { useDb } from "../utils.ts"
 

tests/collection/types.test.ts

@@ -1,5 +1,5 @@
 import { collection, kvdex, model } from "../../mod.ts"
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { useKv } from "../utils.ts"
 
 Deno.test("collection - types", async (t) => {

tests/collection/update.test.ts

@@ -1,5 +1,6 @@
 import { collection, kvdex, model } from "../../mod.ts"
-import { assert, assertEquals } from "../deps.ts"
+import { assertEquals } from "assert_equals"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1, mockUser2, mockUserInvalid } from "../mocks.ts"
 import { useDb, useKv } from "../utils.ts"
 

tests/collection/updateMany.test.ts

@@ -1,5 +1,6 @@
 import { collection, kvdex, model } from "../../mod.ts"
-import { assert, assertEquals } from "../deps.ts"
+import { assertEquals } from "assert_equals"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1, mockUserInvalid } from "../mocks.ts"
 import { generateNumbers, generateUsers, useDb, useKv } from "../utils.ts"
 

tests/collection/updateOne.test.ts

@@ -1,5 +1,7 @@
 import { collection, kvdex, model } from "../../mod.ts"
-import { assert, assertEquals, assertNotEquals } from "../deps.ts"
+import { assertEquals } from "assert_equals"
+import { assertNotEquals } from "assert_not_equals"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser3 } from "../mocks.ts"
 import { mockUser2 } from "../mocks.ts"
 import { mockUser1, mockUserInvalid } from "../mocks.ts"

tests/collection/upsert.test.ts

@@ -1,4 +1,4 @@
-import { assert } from "../deps.ts"
+import { assert } from "jsr:@std/[email protected]/assert"
 import { mockUser1, mockUser2, mockUser3 } from "../mocks.ts"
 import { User } from "../models.ts"
 import { useDb } from "../utils.ts"