@knpkv/confluence-to-markdown 0.6.0 → 0.7.0

package/test/layers.test.ts

@@ -0,0 +1,12 @@
+import { describe, expect, it } from "@effect/vitest"
+import { getLayerType } from "../src/commands/layers.js"
+
+describe("getLayerType", () => {
+  it("routes fetch to the config-free fetch layer", () => {
+    expect(getLayerType(["fetch"])).toBe("fetch")
+  })
+
+  it("keeps clone on the clone layer", () => {
+    expect(getLayerType(["clone"])).toBe("clone")
+  })
+})

package/test/oauthServer.test.ts

@@ -1,14 +1,13 @@
 import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient"
-import * as HttpClient from "@effect/platform/HttpClient"
-import * as HttpClientRequest from "@effect/platform/HttpClientRequest"
 import { describe, expect, it } from "@effect/vitest"
 import * as Effect from "effect/Effect"
 import * as Fiber from "effect/Fiber"
 import * as Layer from "effect/Layer"
+import { HttpClient, HttpClientRequest } from "effect/unstable/http"
 import { HttpServerFactoryLive } from "../src/internal/NodeLayers.js"
 import { startCallbackServer } from "../src/internal/oauthServer.js"
 
-const HttpClientLive = NodeHttpClient.layer
+const HttpClientLive = NodeHttpClient.layerUndici
 
 describe("oauthServer", () => {
   describe("startCallbackServer", () => {
@@ -17,7 +16,7 @@ describe("oauthServer", () => {
         const expectedState = "test-state-123"
         const result = yield* startCallbackServer(expectedState)
 
-        expect(result.port).toBeGreaterThanOrEqual(8585)
+        expect(result.port).toBe(8585)
         expect(typeof result.codePromise).toBe("object")
         expect(typeof result.shutdown).toBe("object")
 
@@ -31,7 +30,7 @@ describe("oauthServer", () => {
         const { codePromise, port, shutdown } = yield* startCallbackServer(expectedState)
 
         // Make callback request in background
-        const codeReceiver = yield* Effect.fork(codePromise)
+        const codeReceiver = yield* Effect.forkChild(codePromise)
 
         // Simulate OAuth callback using Effect HttpClient
         const client = yield* HttpClient.HttpClient

package/test/pageInput.test.ts

@@ -0,0 +1,83 @@
+import { describe, expect, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import { parseConfluencePageUrl, resolvePageInput } from "../src/commands/pageInput.js"
+
+describe("page input", () => {
+  it.effect("parses shorthand Atlassian URLs", () =>
+    Effect.gen(function*() {
+      const result = yield* parseConfluencePageUrl("https://example.atlassian.com/2333334354")
+
+      expect(result).toEqual({
+        baseUrl: "https://example.atlassian.com",
+        pageId: "2333334354"
+      })
+    }))
+
+  it.effect("parses space page URLs", () =>
+    Effect.gen(function*() {
+      const result = yield* parseConfluencePageUrl(
+        "https://example.atlassian.net/wiki/spaces/DEV/pages/2333334354/Page+Title"
+      )
+
+      expect(result).toEqual({
+        baseUrl: "https://example.atlassian.net",
+        pageId: "2333334354"
+      })
+    }))
+
+  it.effect("parses wiki page URLs", () =>
+    Effect.gen(function*() {
+      const result = yield* parseConfluencePageUrl("https://example.atlassian.net/wiki/pages/2333334354")
+
+      expect(result).toEqual({
+        baseUrl: "https://example.atlassian.net",
+        pageId: "2333334354"
+      })
+    }))
+
+  it.effect("rejects unsupported hosts", () =>
+    Effect.gen(function*() {
+      const result = yield* Effect.result(parseConfluencePageUrl("https://example.com/wiki/pages/2333334354"))
+
+      expect(result._tag).toBe("Failure")
+    }))
+
+  it.effect("rejects URLs without a page ID", () =>
+    Effect.gen(function*() {
+      const result = yield* Effect.result(parseConfluencePageUrl("https://example.atlassian.net/wiki/spaces/DEV"))
+
+      expect(result._tag).toBe("Failure")
+    }))
+
+  it.effect("rejects page URLs when the segment after pages is not numeric", () =>
+    Effect.gen(function*() {
+      const result = yield* Effect.result(
+        parseConfluencePageUrl("https://example.atlassian.net/wiki/spaces/DEV/pages/not-a-page-id/2333334354")
+      )
+
+      expect(result._tag).toBe("Failure")
+    }))
+
+  it.effect("resolves separate page ID and base URL", () =>
+    Effect.gen(function*() {
+      const result = yield* resolvePageInput({
+        pageId: "2333334354",
+        baseUrl: "https://example.atlassian.net"
+      })
+
+      expect(result).toEqual({
+        baseUrl: "https://example.atlassian.net",
+        pageId: "2333334354"
+      })
+    }))
+
+  it.effect("rejects mixed URL and separate flags", () =>
+    Effect.gen(function*() {
+      const result = yield* Effect.result(resolvePageInput({
+        url: "https://example.atlassian.net/wiki/pages/2333334354",
+        pageId: "2333334354"
+      }))
+
+      expect(result._tag).toBe("Failure")
+    }))
+})

package/test/tokenStorage.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "@effect/vitest"
-import * as Either from "effect/Either"
+import * as Result from "effect/Result"
 import * as Schema from "effect/Schema"
 import { OAuthConfigSchema, OAuthTokenSchema } from "../src/Schemas.js"
 
@@ -18,8 +18,8 @@ describe("tokenStorage schemas", () => {
         cloud_id: "test_cloud_id",
         site_url: "https://test.atlassian.net"
       }
-      const result = Schema.decodeUnknownEither(OAuthTokenSchema)(token)
-      expect(Either.isRight(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthTokenSchema)(token)
+      expect(Result.isSuccess(result)).toBe(true)
     })
 
     it("validates token with user info", () => {
@@ -36,10 +36,10 @@ describe("tokenStorage schemas", () => {
           email: "test@example.com"
         }
       }
-      const result = Schema.decodeUnknownEither(OAuthTokenSchema)(token)
-      expect(Either.isRight(result)).toBe(true)
-      if (Either.isRight(result)) {
-        expect(result.right.user?.name).toBe("Test User")
+      const result = Schema.decodeUnknownResult(OAuthTokenSchema)(token)
+      expect(Result.isSuccess(result)).toBe(true)
+      if (Result.isSuccess(result)) {
+        expect(result.success.user?.name).toBe("Test User")
       }
     })
 
@@ -52,8 +52,8 @@ describe("tokenStorage schemas", () => {
         cloud_id: "test",
         site_url: "https://test.atlassian.net"
       }
-      const result = Schema.decodeUnknownEither(OAuthTokenSchema)(token)
-      expect(Either.isLeft(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthTokenSchema)(token)
+      expect(Result.isFailure(result)).toBe(true)
     })
 
     it("rejects token with invalid expires_at type", () => {
@@ -65,8 +65,8 @@ describe("tokenStorage schemas", () => {
         cloud_id: "test",
         site_url: "https://test.atlassian.net"
       }
-      const result = Schema.decodeUnknownEither(OAuthTokenSchema)(token)
-      expect(Either.isLeft(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthTokenSchema)(token)
+      expect(Result.isFailure(result)).toBe(true)
     })
   })
 
@@ -76,24 +76,24 @@ describe("tokenStorage schemas", () => {
         clientId: "test_client_id",
         clientSecret: "test_client_secret"
       }
-      const result = Schema.decodeUnknownEither(OAuthConfigSchema)(config)
-      expect(Either.isRight(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthConfigSchema)(config)
+      expect(Result.isSuccess(result)).toBe(true)
     })
 
     it("rejects config missing clientSecret", () => {
       const config = {
         clientId: "test_client_id"
       }
-      const result = Schema.decodeUnknownEither(OAuthConfigSchema)(config)
-      expect(Either.isLeft(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthConfigSchema)(config)
+      expect(Result.isFailure(result)).toBe(true)
     })
 
     it("rejects config missing clientId", () => {
       const config = {
         clientSecret: "test_client_secret"
       }
-      const result = Schema.decodeUnknownEither(OAuthConfigSchema)(config)
-      expect(Either.isLeft(result)).toBe(true)
+      const result = Schema.decodeUnknownResult(OAuthConfigSchema)(config)
+      expect(Result.isFailure(result)).toBe(true)
     })
   })
 })

package/dist/SchemaConverterError.d.ts

@@ -1,108 +0,0 @@
-declare const ParseError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
-    readonly _tag: "ParseError";
-} & Readonly<A>;
-/**
- * Error thrown when parsing HTML or Markdown fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { ParseError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... parsing operation
- * }).pipe(
- *   Effect.catchTag("ParseError", (error) =>
- *     Effect.sync(() => console.error(`Parse error: ${error.message}`))
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export declare class ParseError extends ParseError_base<{
-    readonly source: "confluence" | "markdown";
-    readonly message: string;
-    readonly position?: {
-        readonly line: number;
-        readonly column: number;
-    };
-    readonly rawContent?: string;
-}> {
-}
-declare const SerializeError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
-    readonly _tag: "SerializeError";
-} & Readonly<A>;
-/**
- * Error thrown when serializing AST to HTML or Markdown fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { SerializeError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... serialization operation
- * }).pipe(
- *   Effect.catchTag("SerializeError", (error) =>
- *     Effect.sync(() => console.error(`Serialize error: ${error.message}`))
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export declare class SerializeError extends SerializeError_base<{
-    readonly target: "confluence" | "markdown";
-    readonly nodeType: string;
-    readonly message: string;
-}> {
-}
-declare const MigrationError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
-    readonly _tag: "MigrationError";
-} & Readonly<A>;
-/**
- * Error thrown when migrating between schema versions fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { MigrationError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... migration operation
- * }).pipe(
- *   Effect.catchTag("MigrationError", (error) =>
- *     Effect.sync(() =>
- *       console.error(`Migration error: ${error.nodeType} v${error.fromVersion} -> v${error.toVersion}`)
- *     )
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export declare class MigrationError extends MigrationError_base<{
-    readonly nodeType: string;
-    readonly fromVersion: number;
-    readonly toVersion: number;
-    readonly message: string;
-}> {
-}
-/**
- * Union of all schema converter errors.
- *
- * @category Errors
- */
-export type SchemaConverterError = ParseError | SerializeError | MigrationError;
-/**
- * Type guard to check if error is a SchemaConverterError.
- *
- * @param error - The error to check
- * @returns True if error is a SchemaConverterError
- *
- * @category Utilities
- */
-export declare const isSchemaConverterError: (error: unknown) => error is SchemaConverterError;
-export {};
-//# sourceMappingURL=SchemaConverterError.d.ts.map

package/dist/SchemaConverterError.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaConverterError.d.ts","sourceRoot":"","sources":["../src/SchemaConverterError.ts"],"names":[],"mappings":";;;AAOA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,UAAW,SAAQ,gBAA+B;IAC7D,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAAA;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IACtE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B,CAAC;CAAG;;;;AAEL;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAe,SAAQ,oBAAmC;IACrE,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAAA;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB,CAAC;CAAG;;;;AAEL;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,cAAe,SAAQ,oBAAmC;IACrE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACzB,CAAC;CAAG;AAEL;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG,cAAc,GAAG,cAAc,CAAA;AAE/E;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,oBAM9D,CAAA"}

package/dist/SchemaConverterError.js

@@ -1,84 +0,0 @@
-/**
- * Error types for schema-based conversion.
- *
- * @module
- */
-import * as Data from "effect/Data";
-/**
- * Error thrown when parsing HTML or Markdown fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { ParseError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... parsing operation
- * }).pipe(
- *   Effect.catchTag("ParseError", (error) =>
- *     Effect.sync(() => console.error(`Parse error: ${error.message}`))
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export class ParseError extends Data.TaggedError("ParseError") {
-}
-/**
- * Error thrown when serializing AST to HTML or Markdown fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { SerializeError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... serialization operation
- * }).pipe(
- *   Effect.catchTag("SerializeError", (error) =>
- *     Effect.sync(() => console.error(`Serialize error: ${error.message}`))
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export class SerializeError extends Data.TaggedError("SerializeError") {
-}
-/**
- * Error thrown when migrating between schema versions fails.
- *
- * @example
- * ```typescript
- * import { Effect } from "effect"
- * import { MigrationError } from "@knpkv/confluence-to-markdown/SchemaConverterError"
- *
- * Effect.gen(function* () {
- *   // ... migration operation
- * }).pipe(
- *   Effect.catchTag("MigrationError", (error) =>
- *     Effect.sync(() =>
- *       console.error(`Migration error: ${error.nodeType} v${error.fromVersion} -> v${error.toVersion}`)
- *     )
- *   )
- * )
- * ```
- *
- * @category Errors
- */
-export class MigrationError extends Data.TaggedError("MigrationError") {
-}
-/**
- * Type guard to check if error is a SchemaConverterError.
- *
- * @param error - The error to check
- * @returns True if error is a SchemaConverterError
- *
- * @category Utilities
- */
-export const isSchemaConverterError = (error) => typeof error === "object" &&
-    error !== null &&
-    "_tag" in error &&
-    ["ParseError", "SerializeError", "MigrationError"].includes(error._tag);
-//# sourceMappingURL=SchemaConverterError.js.map

package/dist/SchemaConverterError.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SchemaConverterError.js","sourceRoot":"","sources":["../src/SchemaConverterError.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AAEnC;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,OAAO,UAAW,SAAQ,IAAI,CAAC,WAAW,CAAC,YAAY,CAK3D;CAAG;AAEL;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,OAAO,cAAe,SAAQ,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAInE;CAAG;AAEL;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,OAAO,cAAe,SAAQ,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAKnE;CAAG;AASL;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAc,EAAiC,EAAE,CACtF,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACd,MAAM,IAAI,KAAK;IACf,CAAC,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CACxD,KAA0B,CAAC,IAAI,CACjC,CAAA"}