diff --git a/types/urlencode/index.d.ts b/types/urlencode/index.d.ts index a74269e486..0b70cc34be 100644 --- a/types/urlencode/index.d.ts +++ b/types/urlencode/index.d.ts @@ -10,13 +10,13 @@ export as namespace urlencode; /** - * Encode string + * Encode string * @param str The string for encoding. */ export function encode(str: string, charset?: string): string; /** - * Decode string + * Decode string * @param encodedString The encoded string. */ export function decode(encodedString: string, charset?: string): string; @@ -26,26 +26,15 @@ export function decode(encodedString: string, charset?: string): string; * @param queryString Querystring * @param charsetParam The charset for parsing */ -export function parse(queryString: string, charsetParam: charsetParam): string; +export function parse(queryString: string, charsetParam: charsetParam): any; export interface charsetParam { - charset: string; + charset: string; } /** * Stringify object - * @param obj Querystring + * @param obj Query Object * @param charsetParam The charset for parsing */ -export function stringify(obj: any, prefix?: charsetParam, charsetParam?: charsetParam): any; +export function stringify(obj: any, prefix?: charsetParam, charsetParam?: charsetParam): string; export default encode; - -// export namespace subProp { -// /*~ For example, given this definition, someone could write: -// *~ import { subProp } from 'yourModule'; -// *~ subProp.foo(); -// *~ or -// *~ import * as yourMod from 'yourModule'; -// *~ yourMod.subProp.foo(); -// */ -// export function foo(): void; -// } \ No newline at end of file diff --git a/types/urlencode/tsconfig.json b/types/urlencode/tsconfig.json index bbcc857ffe..197f1167a4 100644 --- a/types/urlencode/tsconfig.json +++ b/types/urlencode/tsconfig.json @@ -7,6 +7,7 @@ "noImplicitAny": true, "noImplicitThis": true, "strictNullChecks": true, + "strictFunctionTypes": false, "baseUrl": "../", "typeRoots": [ "../" diff --git a/types/urlencode/urlencode-tests.ts b/types/urlencode/urlencode-tests.ts index 5abdb8f9a2..5ee486a92b 100644 --- a/types/urlencode/urlencode-tests.ts +++ b/types/urlencode/urlencode-tests.ts @@ -2,14 +2,14 @@ import urlencode, { decode , parse, stringify } from 'urlencode'; urlencode('苏千'); // default is utf8 urlencode('苏千', 'gbk'); // '%CB%D5%C7%A7' - + // decode gbk decode('%CB%D5%C7%A7', 'gbk'); // '苏千' - + // parse gbk querystring parse('nick=%CB%D5%C7%A7', {charset: 'gbk'}); // {nick: '苏千'} - + // stringify obj with gbk encoding -var str = 'x[y][0][v][w]=' + urlencode('雾空', 'gbk'); // x[y][0][v][w]=%CE%ED%BF%D5 -var obj = {'x' : {'y' : [{'v' : {'w' : '雾空'}}]}}; -stringify(obj, {charset: 'gbk'}) \ No newline at end of file +const str = 'x[y][0][v][w]=' + urlencode('雾空', 'gbk'); // x[y][0][v][w]=%CE%ED%BF%D5 +const obj = {x: {y : [{v : {w : '雾空'}}]}}; +stringify(obj, {charset: 'gbk'});