PKG -- [root] Fix type declaration generation

packages/config/package.json

@@ -28,7 +28,7 @@
   "main": "dist/config.js",
   "module": "dist/config.module.js",
   "unpkg": "dist/config.umd.js",
-  "types": "dist/config.d.ts",
+  "types": "types/config.d.ts",
   "scripts": {
     "prepublishOnly": "npm test && npm run build",
     "test": "jest",

packages/config/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types"
+    "declarationDir": "types",
+    "rootDir": "src"
   }
 }

packages/fcl-bundle/src/build/get-input-options.js

@@ -83,6 +83,7 @@ module.exports = function getInputOptions(package, build) {
             "**/*.cjs",
             "**/*.mjs",
           ],
+          useTsconfigDeclarationDir: true,
         }),
       replace({
         preventAssignment: true,

packages/fcl-bundle/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}

packages/fcl-wc/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}

packages/fcl/package.json

@@ -31,7 +31,7 @@
   },
   "source": {
     "src/fcl.js": {
-      "cjs": "./dist/fcl.js",
+      "cjs": "./dist/fcl.ts",
       "esm": "./dist/fcl.module.js",
       "umd": "./dist/fcl.umd.min.js"
     },

packages/fcl/tsconfig.json

@@ -1,29 +1,9 @@
 {
+  "extends": "../../tsconfig",
   // Change this to match your project
-  "exclude": [
-    "src/**/*.test.js",
-  ],
+  "include": ["src/**/*"],
   "compilerOptions": {
-    // Tells TypeScript to read JS files, as
-    // normally they are ignored as source files
-    "allowJs": true,
-    // Generate d.ts files
-    "declaration": true,
-    // This compiler run should
-    // only output d.ts files
-    "emitDeclarationOnly": true,
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
-    // go to js file when using IDE functions like
-    // "Go to Definition" in VSCode
-    "declarationMap": false,
-    "typeRoots": [
-      "../config/config",
-      "../sdk/sdk",
-      "../util-address/types",
-      "../util-encode-key/types"
-    ]
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}

packages/rlp/package.json

@@ -26,7 +26,7 @@
   "main": "dist/rlp.js",
   "module": "dist/rlp.module.js",
   "unpkg": "dist/rlp.umd.js",
-  "types": "dist/index.d.ts",
+  "types": "types/index.d.ts",
   "scripts": {
     "prepublishOnly": "npm test && npm run build",
     "test": "jest",

packages/rlp/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types"
+    "declarationDir": "types",
+    "rootDir": "src"
   }
 }

packages/rlp/types/index.d.ts

@@ -0,0 +1,41 @@
+/// <reference types="node" />
+import { Buffer } from "buffer";
+export { Buffer };
+type EncodeInput = Buffer | string | number | Uint8Array | null | undefined | EncodeInput[];
+/**
+ * Built on top of rlp library, removing the BN dependency for the flow.
+ * Package : https://github.com/ethereumjs/rlp
+ * RLP License : https://github.com/ethereumjs/rlp/blob/master/LICENSE
+ *
+ * ethereumjs/rlp is licensed under the
+ * Mozilla Public License 2.0
+ * Permissions of this weak copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work.
+ */
+/**
+ * @param input - will be converted to buffer
+ * @returns returns buffer of encoded data
+ */
+export declare function encode(input: EncodeInput): Buffer;
+/**
+ * Built on top of rlp library, removing the BN dependency for the flow.
+ * Package : https://github.com/ethereumjs/rlp
+ * RLP License : https://github.com/ethereumjs/rlp/blob/master/LICENSE
+ *
+ * ethereumjs/rlp is licensed under the
+ * Mozilla Public License 2.0
+ * Permissions of this weak copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work.
+ */
+/**
+ * @param input - will be converted to buffer
+ * @param stream Is the input a stream (false by default)
+ * @returns returns buffer of encoded data
+ */
+export declare function decode(input: Buffer | Uint8Array, stream?: boolean): Buffer;
+/**
+ * Get the length of the RLP input
+ * @param input
+ * @returns The length of the input or an empty Buffer if no input
+ */
+export declare function getLength(input: Buffer | Uint8Array | null | undefined | string | number): number;
+/** Transform anything into a Buffer */
+export declare function toBuffer(v: Buffer | string | number | Uint8Array | null | undefined): Buffer;

packages/sdk/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types"
+    "declarationDir": "types",
+    "rootDir": "src"
   }
 }

packages/transport-http/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}

packages/transport-http/types/connect-subscribe-events.d.ts

@@ -0,0 +1 @@
+export declare function connectSubscribeEvents(ix: any, context?: any, opts?: any): Promise<any>;

packages/transport-http/types/connect-ws.d.ts

@@ -0,0 +1,25 @@
+import { StreamConnection } from "@onflow/typedefs";
+export declare class WebsocketError extends Error {
+    code?: number;
+    reason?: string;
+    wasClean?: boolean;
+    constructor({ code, reason, message, wasClean, }: {
+        code?: number;
+        reason?: string;
+        message?: string;
+        wasClean?: boolean;
+    });
+}
+type WebSocketConnection<T> = StreamConnection<{
+    data: T;
+}>;
+export declare function connectWs<T>({ hostname, path, params, getParams, retryLimit, retryIntervalMs, }: {
+    hostname: string;
+    path: string;
+    params?: Record<string, string>;
+    getParams?: () => Record<string, string> | undefined;
+    retryLimit?: number;
+    retryIntervalMs?: number;
+}): WebSocketConnection<T>;
+export declare function buildConnectionUrl(hostname: string, path?: string, params?: Record<string, string | number | string[] | number[] | null | undefined>): string;
+export {};

packages/transport-http/types/http-request.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Creates an HTTP Request to be sent to a REST Access API via Fetch API.
+ *
+ * @param {object} options - Options for the HTTP Request
+ * @param {String} options.hostname - Access API Hostname
+ * @param {String} options.path - Path to the resource on the Access API
+ * @param {String} options.method - HTTP Method
+ * @param {object} options.body - HTTP Request Body
+ * @param {object} [options.headers] - HTTP Request Headers
+ * @param {boolean} [options.enableRequestLogging=true] - Enable/Disable request logging
+ * @param {number} [options.retryLimit=5] - Number of times to retry request
+ * @param {number} [options.retryIntervalMs=1000] - Time in milliseconds to wait before retrying request
+ * @param {number} [options.timeoutLimit=30000] - Time in milliseconds to wait before timing out request
+ *
+ * @returns JSON object response from Access API.
+ */
+export function httpRequest({ hostname, path, method, body, headers, retryLimit, retryIntervalMs, timeoutLimit, enableRequestLogging, }: {
+    hostname: string;
+    path: string;
+    method: string;
+    body: object;
+    headers?: object | undefined;
+    enableRequestLogging?: boolean | undefined;
+    retryLimit?: number | undefined;
+    retryIntervalMs?: number | undefined;
+    timeoutLimit?: number | undefined;
+}): Promise<any>;
+export class HTTPRequestError extends Error {
+    constructor({ error, hostname, path, method, requestBody, responseBody, responseStatusText, statusCode, }: {
+        error: any;
+        hostname: any;
+        path: any;
+        method: any;
+        requestBody: any;
+        responseBody: any;
+        responseStatusText: any;
+        statusCode: any;
+    });
+    statusCode: any;
+    errorMessage: any;
+}

packages/transport-http/types/sdk-send-http.d.ts

@@ -0,0 +1,15 @@
+export { sendExecuteScript } from "./send-execute-script";
+export { sendGetAccount } from "./send-get-account";
+export { sendGetBlockHeader } from "./send-get-block-header";
+export { sendGetBlock } from "./send-get-block";
+export { sendGetCollection } from "./send-get-collection";
+export { sendGetEvents } from "./send-get-events";
+export { sendGetTransaction } from "./send-get-transaction";
+export { sendGetTransactionStatus } from "./send-get-transaction-status";
+export { sendPing } from "./send-ping";
+export { sendTransaction } from "./send-transaction";
+export { sendGetNetworkParameters } from "./send-get-network-parameters";
+export { connectSubscribeEvents } from "./connect-subscribe-events";
+export { send } from "./send-http";
+export { WebsocketError } from "./connect-ws";
+export { HTTPRequestError } from "./http-request.js";

packages/transport-http/types/send-execute-script.d.ts

@@ -0,0 +1 @@
+export function sendExecuteScript(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-account.d.ts

@@ -0,0 +1 @@
+export function sendGetAccount(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-block-header.d.ts

@@ -0,0 +1 @@
+export function sendGetBlockHeader(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-block.d.ts

@@ -0,0 +1 @@
+export function sendGetBlock(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-collection.d.ts

@@ -0,0 +1 @@
+export function sendGetCollection(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-events.d.ts

@@ -0,0 +1 @@
+export function sendGetEvents(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-network-parameters.d.ts

@@ -0,0 +1 @@
+export function sendGetNetworkParameters(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-transaction-status.d.ts

@@ -0,0 +1 @@
+export function sendGetTransactionStatus(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-get-transaction.d.ts

@@ -0,0 +1 @@
+export function sendGetTransaction(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-http.d.ts

@@ -0,0 +1 @@
+export function send(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-ping.d.ts

@@ -0,0 +1 @@
+export function sendPing(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/send-transaction.d.ts

@@ -0,0 +1 @@
+export function sendTransaction(ix: any, context?: {}, opts?: {}): Promise<any>;

packages/transport-http/types/utils.d.ts

@@ -0,0 +1 @@
+export function safeParseJSON(data: any): any;

packages/transport-http/types/websocket.d.ts

@@ -0,0 +1 @@
+export declare const WebSocket: new (url: string | URL, protocols?: string | string[] | undefined) => WebSocket;

packages/typedefs/package.json

@@ -25,7 +25,7 @@
   "main": "dist/typedefs.js",
   "module": "dist/typedefs.module.js",
   "unpkg": "dist/typedefs.umd.js",
-  "types": "dist/index.d.ts",
+  "types": "types/index.d.ts",
   "scripts": {
     "prepublishOnly": "npm test && npm run build",
     "test": "jest",

packages/typedefs/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}

packages/types/package.json

@@ -26,7 +26,7 @@
   "main": "dist/types.js",
   "module": "dist/types.module.js",
   "unpkg": "dist/types.umd.js",
-  "types": "dist/types.d.ts",
+  "types": "types/types.d.ts",
   "scripts": {
     "prepublishOnly": "npm test && npm run build",
     "test": "jest",

packages/types/tsconfig.json

@@ -3,9 +3,7 @@
   // Change this to match your project
   "include": ["src/**/*"],
   "compilerOptions": {
-    // Types should go into this directory.
-    // Removing this would place the .d.ts files
-    // next to the .js files
-    "outDir": "types",
+    "declarationDir": "types",
+    "rootDir": "src"
   }
-}
+}