From 5209f329bd38a14f5222aae98e2f6818b954ec17 Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Sun, 27 Mar 2022 13:26:13 -0700
Subject: [PATCH] build(types): copy .d.ts files from src to types (#1218)

---
 .../Breakpoint/BreakpointObserver.svelte      |  5 +--
 scripts/build-docs.js                         |  7 ++++
 src/Breakpoint/breakpointObserver.d.ts        | 32 +++++++++++--------
 src/Breakpoint/breakpointObserver.js          |  2 ++
 src/Breakpoint/breakpoints.d.ts               |  2 ++
 src/Breakpoint/breakpoints.js                 |  2 ++
 src/NumberInput/NumberInput.svelte            |  2 +-
 src/index.js                                  |  4 ++-
 tests/Breakpoint.test.svelte                  | 10 +++++-
 types/Breakpoint/breakpointObserver.d.ts      | 28 ++++++++++++++++
 types/Breakpoint/breakpoints.d.ts             | 11 +++++++
 types/Breakpoint/index.d.ts                   |  3 ++
 types/index.d.ts                              |  4 +--
 13 files changed, 90 insertions(+), 22 deletions(-)
 create mode 100644 types/Breakpoint/breakpointObserver.d.ts
 create mode 100644 types/Breakpoint/breakpoints.d.ts
 create mode 100644 types/Breakpoint/index.d.ts

diff --git a/docs/src/pages/framed/Breakpoint/BreakpointObserver.svelte b/docs/src/pages/framed/Breakpoint/BreakpointObserver.svelte
index a37e4683..db427d3a 100644
--- a/docs/src/pages/framed/Breakpoint/BreakpointObserver.svelte
+++ b/docs/src/pages/framed/Breakpoint/BreakpointObserver.svelte
@@ -1,8 +1,5 @@
 <script>
-  import {
-    breakpointObserver,
-    breakpoints,
-  } from "carbon-components-svelte/src/Breakpoint";
+  import { breakpointObserver, breakpoints } from "carbon-components-svelte";
 
   const size = breakpointObserver();
   const smaller = size.smallerThan("md");
diff --git a/scripts/build-docs.js b/scripts/build-docs.js
index 76bd8794..92efe913 100644
--- a/scripts/build-docs.js
+++ b/scripts/build-docs.js
@@ -1,3 +1,5 @@
+const fs = require("fs");
+const glob = require("glob");
 const { sveld } = require("sveld");
 const pkg = require("../package.json");
 
@@ -18,3 +20,8 @@ sveld({
     outFile: "docs/src/COMPONENT_API.json",
   },
 });
+
+glob.sync("./src/**/*.d.ts").forEach((file) => {
+  console.log("Copying", file, " to types/");
+  fs.copyFileSync(file, file.replace(/src/, "types"));
+});
diff --git a/src/Breakpoint/breakpointObserver.d.ts b/src/Breakpoint/breakpointObserver.d.ts
index 6c8cbdf1..70ec9894 100644
--- a/src/Breakpoint/breakpointObserver.d.ts
+++ b/src/Breakpoint/breakpointObserver.d.ts
@@ -6,17 +6,23 @@ import type { BreakpointSize, BreakpointValue } from "./breakpoints";
  * It also provides functions for creating derived stores used to do comparisons.
  */
 export function breakpointObserver(): {
-    subscribe: (this: void, run: Subscriber<any>, invalidate?: (value?: any) => void) => Unsubscriber;
-    /**
-     * Returns a store readable store that returns whether the current
-     * breakpoint is smaller than {@link size}.
-     * @param {BreakpointSize} size Size to compare against.
-     */
-    smallerThan: (size: BreakpointSize) => Readable<boolean>;
-    /**
-     * Returns a store readable store that returns whether the current
-     * breakpoint is larger than {@link size}.
-     * @param {BreakpointSize} size Size to compare against.
-     */
-    largerThan: (size: BreakpointSize) => Readable<boolean>;
+  subscribe: (
+    this: void,
+    run: Subscriber<any>,
+    invalidate?: (value?: any) => void
+  ) => Unsubscriber;
+  /**
+   * Returns a store readable store that returns whether the current
+   * breakpoint is smaller than {@link size}.
+   * @param {BreakpointSize} size Size to compare against.
+   */
+  smallerThan: (size: BreakpointSize) => Readable<boolean>;
+  /**
+   * Returns a store readable store that returns whether the current
+   * breakpoint is larger than {@link size}.
+   * @param {BreakpointSize} size Size to compare against.
+   */
+  largerThan: (size: BreakpointSize) => Readable<boolean>;
 };
+
+export default breakpointObserver;
diff --git a/src/Breakpoint/breakpointObserver.js b/src/Breakpoint/breakpointObserver.js
index a5836bd6..c87fc4d1 100644
--- a/src/Breakpoint/breakpointObserver.js
+++ b/src/Breakpoint/breakpointObserver.js
@@ -78,3 +78,5 @@ function checkSizeValid(size) {
   if (size in breakpoints == false)
     throw new Error(`"${size}" is not a valid breakpoint size.`);
 }
+
+export default breakpointObserver;
diff --git a/src/Breakpoint/breakpoints.d.ts b/src/Breakpoint/breakpoints.d.ts
index 86da62ef..0f89df39 100644
--- a/src/Breakpoint/breakpoints.d.ts
+++ b/src/Breakpoint/breakpoints.d.ts
@@ -7,3 +7,5 @@ export const breakpoints: Record<BreakpointSize, BreakpointValue>;
 export type BreakpointSize = "sm" | "md" | "lg" | "xlg" | "max";
 
 export type BreakpointValue = 320 | 672 | 1056 | 1312 | 1584;
+
+export default breakpoints;
diff --git a/src/Breakpoint/breakpoints.js b/src/Breakpoint/breakpoints.js
index 5773f066..a65be791 100644
--- a/src/Breakpoint/breakpoints.js
+++ b/src/Breakpoint/breakpoints.js
@@ -9,3 +9,5 @@ export const breakpoints = Object.freeze({
   xlg: 1312,
   max: 1584,
 });
+
+export default breakpoints;
diff --git a/src/NumberInput/NumberInput.svelte b/src/NumberInput/NumberInput.svelte
index 2695b2b6..b17ca9c7 100644
--- a/src/NumberInput/NumberInput.svelte
+++ b/src/NumberInput/NumberInput.svelte
@@ -269,4 +269,4 @@
       <div id="{errorId}" class:bx--form-requirement="{true}">{warnText}</div>
     {/if}
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/index.js b/src/index.js
index 38fd5053..eab6202d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,9 @@
 export { Accordion, AccordionItem, AccordionSkeleton } from "./Accordion";
 export { AspectRatio } from "./AspectRatio";
 export { Breadcrumb, BreadcrumbItem, BreadcrumbSkeleton } from "./Breadcrumb";
-export { Breakpoint, breakpointObserver, breakpoints } from "./Breakpoint";
+export { Breakpoint } from "./Breakpoint";
+export { default as breakpointObserver } from "./Breakpoint/breakpointObserver";
+export { default as breakpoints } from "./Breakpoint/breakpoints";
 export { Button, ButtonSkeleton, ButtonSet } from "./Button";
 export { Checkbox, CheckboxSkeleton } from "./Checkbox";
 export { ContentSwitcher, Switch } from "./ContentSwitcher";
diff --git a/tests/Breakpoint.test.svelte b/tests/Breakpoint.test.svelte
index cbad6dc0..713bb4ae 100644
--- a/tests/Breakpoint.test.svelte
+++ b/tests/Breakpoint.test.svelte
@@ -1,10 +1,18 @@
 <script lang="ts">
-  import { Breakpoint } from "../types";
+  import { Breakpoint, breakpointObserver, breakpoints } from "../types";
   import type { BreakpointProps } from "../types/Breakpoint/Breakpoint.svelte";
 
   let size: BreakpointProps["size"];
+
+  const sizeObserver = breakpointObserver();
+  const smaller = sizeObserver.smallerThan("md");
+  const larger = sizeObserver.largerThan("md");
 </script>
 
+{smaller}
+{larger}
+{breakpoints.md}
+
 <Breakpoint
   bind:size
   let:size="{currentSize}"
diff --git a/types/Breakpoint/breakpointObserver.d.ts b/types/Breakpoint/breakpointObserver.d.ts
new file mode 100644
index 00000000..70ec9894
--- /dev/null
+++ b/types/Breakpoint/breakpointObserver.d.ts
@@ -0,0 +1,28 @@
+import type { Readable, Subscriber, Unsubscriber } from "svelte/store";
+import type { BreakpointSize, BreakpointValue } from "./breakpoints";
+
+/**
+ * Creates a readable store that returns the current breakpoint size.
+ * It also provides functions for creating derived stores used to do comparisons.
+ */
+export function breakpointObserver(): {
+  subscribe: (
+    this: void,
+    run: Subscriber<any>,
+    invalidate?: (value?: any) => void
+  ) => Unsubscriber;
+  /**
+   * Returns a store readable store that returns whether the current
+   * breakpoint is smaller than {@link size}.
+   * @param {BreakpointSize} size Size to compare against.
+   */
+  smallerThan: (size: BreakpointSize) => Readable<boolean>;
+  /**
+   * Returns a store readable store that returns whether the current
+   * breakpoint is larger than {@link size}.
+   * @param {BreakpointSize} size Size to compare against.
+   */
+  largerThan: (size: BreakpointSize) => Readable<boolean>;
+};
+
+export default breakpointObserver;
diff --git a/types/Breakpoint/breakpoints.d.ts b/types/Breakpoint/breakpoints.d.ts
new file mode 100644
index 00000000..0f89df39
--- /dev/null
+++ b/types/Breakpoint/breakpoints.d.ts
@@ -0,0 +1,11 @@
+/**
+ * Pixel sizes of Carbon grid breakpoints.
+ * @type {Record<BreakpointSize, BreakpointValue>}
+ */
+export const breakpoints: Record<BreakpointSize, BreakpointValue>;
+
+export type BreakpointSize = "sm" | "md" | "lg" | "xlg" | "max";
+
+export type BreakpointValue = 320 | 672 | 1056 | 1312 | 1584;
+
+export default breakpoints;
diff --git a/types/Breakpoint/index.d.ts b/types/Breakpoint/index.d.ts
new file mode 100644
index 00000000..e9046700
--- /dev/null
+++ b/types/Breakpoint/index.d.ts
@@ -0,0 +1,3 @@
+export { default as Breakpoint } from "./Breakpoint.svelte";
+export { breakpointObserver } from "./breakpointObserver";
+export { breakpoints } from "./breakpoints";
diff --git a/types/index.d.ts b/types/index.d.ts
index 105d9c70..40399657 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -6,8 +6,8 @@ export { default as Breadcrumb } from "./Breadcrumb/Breadcrumb.svelte";
 export { default as BreadcrumbItem } from "./Breadcrumb/BreadcrumbItem.svelte";
 export { default as BreadcrumbSkeleton } from "./Breadcrumb/BreadcrumbSkeleton.svelte";
 export { default as Breakpoint } from "./Breakpoint/Breakpoint.svelte";
-export { default as breakpointObserver } from "./Breakpoint";
-export { default as breakpoints } from "./Breakpoint";
+export { default as breakpointObserver } from "./Breakpoint/breakpointObserver";
+export { default as breakpoints } from "./Breakpoint/breakpoints";
 export { default as Button } from "./Button/Button.svelte";
 export { default as ButtonSkeleton } from "./Button/ButtonSkeleton.svelte";
 export { default as ButtonSet } from "./Button/ButtonSet.svelte";