-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add type define #3
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,30 @@ | ||
module.exports = { | ||
'env': { | ||
'browser': true, | ||
'commonjs': true, | ||
'es2021': true | ||
}, | ||
'extends': 'eslint:recommended', | ||
'parserOptions': { | ||
'ecmaVersion': 'latest' | ||
}, | ||
'rules': { | ||
'indent': [ | ||
'error', | ||
2 | ||
], | ||
'linebreak-style': [ | ||
'error', | ||
'unix' | ||
], | ||
'quotes': [ | ||
'error', | ||
'single' | ||
], | ||
'semi': [ | ||
'error', | ||
'always' | ||
] | ||
} | ||
'env': { | ||
'node': true, | ||
'browser': true, | ||
'commonjs': true, | ||
'es2021': true | ||
}, | ||
'extends': 'eslint:recommended', | ||
'parserOptions': { | ||
'ecmaVersion': 'latest' | ||
}, | ||
'rules': { | ||
'indent': [ | ||
'error', | ||
2 | ||
], | ||
'linebreak-style': [ | ||
'error', | ||
'unix' | ||
], | ||
'quotes': [ | ||
'error', | ||
'single' | ||
], | ||
'semi': [ | ||
'error', | ||
'always' | ||
] | ||
} | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
/// <reference types="node" /> | ||
|
||
export interface SubnetInfo { | ||
networkAddress: string; | ||
firstAddress: string; | ||
lastAddress: string; | ||
broadcastAddress: string; | ||
subnetMask: string; | ||
subnetMaskLength: number; | ||
numHosts: number; | ||
length: number; | ||
contains(ip: string): boolean; | ||
} | ||
|
||
/** | ||
* Check two IP address are the same. | ||
*/ | ||
export function isEqual(ip1: string, ip2: string): boolean; | ||
|
||
/** | ||
* Convert an IP string into a buffer. | ||
*/ | ||
export function toBuffer(ip: string, buffer?: Buffer, offset?: number): Buffer; | ||
|
||
/** | ||
* Convert an IP buffer into a string. | ||
*/ | ||
export function toString(ip: Buffer, offset?: number, length?: number): string; | ||
|
||
/** | ||
* Get the subnet mask from a CIDR prefix length. | ||
* | ||
* @param family The IP family is infered from the prefixLength, but can be explicity specified as either "ipv4" or "ipv6". | ||
*/ | ||
export function fromPrefixLen(prefixLength: number, family?: "ipv4" | "ipv6"): string; | ||
|
||
/** | ||
* Get the network ID IP address from an IP address and its subnet mask. | ||
*/ | ||
export function mask(ip: string, mask: string): string; | ||
|
||
/** | ||
* Get the network ID IP address from an IP address in CIDR notation. | ||
*/ | ||
export function cidr(cidr: string): string; | ||
|
||
/** | ||
* Get the bitwise inverse (NOT every octet) of an IP address or subnet mask. | ||
*/ | ||
export function not(ip: string): string; | ||
|
||
/** | ||
* Get the bitwise OR of two IP addresses (usually an IP address and a subnet mask). | ||
*/ | ||
export function or(ip: string, mask: string): string; | ||
|
||
/** | ||
* Check whether an IP is within a private IP address range. | ||
*/ | ||
export function isPrivate(ip: string): boolean; | ||
|
||
/** | ||
* Check whether an IP is within a public IP address range. | ||
*/ | ||
export function isPublic(ip: string): boolean; | ||
|
||
/** | ||
* Check whether an IP is a loopback address. | ||
*/ | ||
export function isLoopback(ip: string): boolean; | ||
|
||
/** | ||
* Check whether an IP is a IPv4 address. | ||
*/ | ||
export function isV4Format(ip: string): boolean; | ||
|
||
/** | ||
* Check whether an IP is a IPv6 address. | ||
*/ | ||
export function isV6Format(ip: string): boolean; | ||
|
||
/** | ||
* Get the loopback address for an IP family. | ||
* | ||
* @param family The family can be either "ipv4" or "ipv6". Default: "ipv4". | ||
*/ | ||
export function loopback(family?: "ipv4" | "ipv6"): string; | ||
|
||
/** | ||
* Get the address for the network interface on the current system with the specified 'name'. | ||
* If no interface name is specified, the first IPv4 address or loopback address is returned. | ||
* | ||
* @param name The name can be any named interface, or 'public' or 'private'. | ||
* @param family The family can be either "ipv4" or "ipv6". Default: "ipv4". | ||
*/ | ||
export function address(name?: "public" | "private" | string, family?: "ipv4" | "ipv6"): string; | ||
|
||
/** | ||
* Convert a string IPv4 IP address to the equivalent long numeric value. | ||
*/ | ||
export function toLong(ip: string): number; | ||
|
||
/** | ||
* Convert an IPv4 IP address from its the long numeric value to a string. | ||
*/ | ||
export function fromLong(ip: number): string; | ||
|
||
/** | ||
* Get the subnet information. | ||
* @param ip IP address. | ||
* @param subnet Subnet address. | ||
*/ | ||
export function subnet(ip: string, subnet: string): SubnetInfo; | ||
|
||
/** | ||
* Get the subnet information. | ||
* @param cidr CIDR address. | ||
*/ | ||
export function cidrSubnet(cidr: string): SubnetInfo; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import { expectType } from 'tsd'; | ||
import ip, { isV4Format } from '.'; | ||
|
||
expectType<string>(ip.address()); | ||
expectType<boolean>(isV4Format('127.0.0.1')); | ||
Comment on lines
+1
to
+5
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Enhance type testing coverage The type tests only cover
Would you like me to generate additional type tests for these functions? |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
const ip = exports; | ||
const { Buffer } = require('buffer'); | ||
const os = require('os'); | ||
const net = require('net'); | ||
|
||
|
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -15,18 +15,23 @@ | |||||||||||||||||||||
}, | ||||||||||||||||||||||
"files": [ | ||||||||||||||||||||||
"lib", | ||||||||||||||||||||||
"index.d.ts", | ||||||||||||||||||||||
"README.md" | ||||||||||||||||||||||
], | ||||||||||||||||||||||
"main": "lib/ip", | ||||||||||||||||||||||
"types": "index.d.ts", | ||||||||||||||||||||||
"devDependencies": { | ||||||||||||||||||||||
"@types/node": "^22.10.5", | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fix @types/node version The specified version - "@types/node": "^22.10.5",
+ "@types/node": "^20.10.5", 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||
"egg-bin": "^6.10.0", | ||||||||||||||||||||||
"eslint": "^8.15.0" | ||||||||||||||||||||||
"eslint": "^8.15.0", | ||||||||||||||||||||||
"tsd": "^0.31.2" | ||||||||||||||||||||||
Comment on lines
+24
to
+27
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion Add TypeScript as a dev dependency Since we're adding TypeScript definitions and using "devDependencies": {
"@types/node": "^20.10.5",
"egg-bin": "^6.10.0",
"eslint": "^8.15.0",
+ "typescript": "^5.3.3",
"tsd": "^0.31.2"
}, 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||
}, | ||||||||||||||||||||||
"scripts": { | ||||||||||||||||||||||
"lint": "eslint lib test", | ||||||||||||||||||||||
"test": "npm run lint && egg-bin test --ts false", | ||||||||||||||||||||||
"fix": "npm run lint -- --fix", | ||||||||||||||||||||||
"ci": "npm run lint && egg-bin cov --ts false" | ||||||||||||||||||||||
"pretest": "npm run lint -- --fix && tsd", | ||||||||||||||||||||||
"test": "egg-bin test --ts false", | ||||||||||||||||||||||
"preci": "npm run lint && tsd", | ||||||||||||||||||||||
"ci": "egg-bin cov --ts false" | ||||||||||||||||||||||
}, | ||||||||||||||||||||||
"license": "MIT" | ||||||||||||||||||||||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename shadowed toString function
The
toString
function shadows the globaltoString
property. Consider renaming it to be more specific, such asipToString
orbufferToIPString
.📝 Committable suggestion
🧰 Tools
🪛 Biome (1.9.4)
[error] 28-28: Do not shadow the global "toString" property.
Consider renaming this variable. It's easy to confuse the origin of variables when they're named after a known global.
(lint/suspicious/noShadowRestrictedNames)