publico/_comuns
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

melhorias

Browse source
This commit is contained in:
Luiz Silva 2024-09-15 13:02:33 -03:00
parent 7971b508c6
commit de77a4c8b6
5 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dist/tipagemRotas.d.ts vendored
View file

@ -31,7 +31,7 @@ export declare class TipagemRotas<T = {
** console.log(mCaminho.resolve({q:"query"})) ** console.log(mCaminho.resolve({q:"query"}))
** "http://localhost:3000/caminho?q=query" ** "http://localhost:3000/caminho?q=query"
*/ */
endereco(query: T): string; endereco(query: T, usarComoHash?: boolean): string;
/** Vai para a url /** Vai para a url
** mCaminho.ir({q:"query"}) ** mCaminho.ir({q:"query"})
** window.location.href = "http://localhost:3000/caminho?q=query" ** window.location.href = "http://localhost:3000/caminho?q=query"

12
dist/tipagemRotas.js vendored
View file

@ -46,13 +46,17 @@ class TipagemRotas {
** console.log(mCaminho.resolve({q:"query"})) ** console.log(mCaminho.resolve({q:"query"}))
** "http://localhost:3000/caminho?q=query" ** "http://localhost:3000/caminho?q=query"
*/ */
endereco(query) { endereco(query, usarComoHash) {
const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost"); const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost");
url.pathname = this.caminho; url.pathname = this.caminho;
const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]]; const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]];
for (const [key, value] of queryKeys) { for (const [key, value] of queryKeys) {
url.searchParams.set(String(key), value); url.searchParams.set(String(key), value);
} }
if (usarComoHash) {
url.hash = `#${url.search}`;
url.search = "";
}
return url.href; return url.href;
} }
/** Vai para a url /** Vai para a url
@ -72,6 +76,12 @@ class TipagemRotas {
const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost"); const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost");
const query = url.searchParams; const query = url.searchParams;
const queryObj = Object.fromEntries(query.entries()); const queryObj = Object.fromEntries(query.entries());
// pegar hash
const hash = url.hash;
if (hash) {
const hashObj = Object.fromEntries(new URLSearchParams(hash.slice(1)).entries());
return { ...queryObj, ...hashObj };
}
return queryObj; return queryObj;
} }
} }

2
dist/tipagemRotas.js.map vendored
View file

@ -1 +1 @@
{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,MAAa,YAAY;IAGvB;;OAEG;IACH,YAAY,GAAG,QAAkB;QALjC,mBAAc,GAAa,EAAE,CAAA;QAM3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IAEH,QAAQ,CAAC,KAAQ;QACf,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,MAAM,SAAS,GACb,OAAO,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3E,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IAEH,UAAU;QACR,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACpD,OAAO,QAAa,CAAA;IACtB,CAAC;CACF;AA9ED,oCA8EC"} {"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"}

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "p-comuns", "name": "p-comuns",
"version": "0.43.0", "version": "0.44.0",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

18
src/tipagemRotas.ts
View file

@ -48,7 +48,7 @@ export class TipagemRotas<T = { [q: string]: string | undefined }> {
** "http://localhost:3000/caminho?q=query" ** "http://localhost:3000/caminho?q=query"
*/ */
endereco(query: T) { endereco(query: T, usarComoHash?: boolean) {
const url = new URL( const url = new URL(
typeof window !== "undefined" ? window.location.href : "http://localhost", typeof window !== "undefined" ? window.location.href : "http://localhost",
) )
@ -61,6 +61,12 @@ export class TipagemRotas<T = { [q: string]: string | undefined }> {
for (const [key, value] of queryKeys) { for (const [key, value] of queryKeys) {
url.searchParams.set(String(key), value) url.searchParams.set(String(key), value)
} }
if (usarComoHash) {
url.hash = `#${url.search}`
url.search = ""
}
return url.href return url.href
} }
@ -85,6 +91,16 @@ export class TipagemRotas<T = { [q: string]: string | undefined }> {
) )
const query = url.searchParams const query = url.searchParams
const queryObj = Object.fromEntries(query.entries()) const queryObj = Object.fromEntries(query.entries())
// pegar hash
const hash = url.hash
if (hash) {
const hashObj = Object.fromEntries(
new URLSearchParams(hash.slice(1)).entries(),
)
return { ...queryObj, ...hashObj } as T
}
return queryObj as T return queryObj as T
} }
} }