Skip to content

Versão 2.2.0 - Converter para Moment.js #1

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.

Sign up for GitHub

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

Open
muchael wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Versão 2.2.0 - Converter para Moment.js #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>br.com.eits.codegen</groupId>
<artifactId>ts-codegen-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>2.1.3</version>
<version>2.2.0</version>

<build>
<plugins>
Expand Down
36 changes: 32 additions & 4 deletions src/main/resources/templates/services-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { Observable, Observer } from 'rxjs';
* path é o caminho SEM BARRA AO FINAL para o broker. Por padrão é simplesmente 'broker'
*/
export interface BrokerConfiguration {
path: string
path: string,
useMoment?: boolean
}

export let BROKER_CONFIGURATION = new InjectionToken<BrokerConfiguration>('broker.configuration');
Expand Down Expand Up @@ -40,19 +41,46 @@ export function dwrWrapper(configuration: BrokerConfiguration, serviceName: stri
function loadDwrIfNeeded(configuration: BrokerConfiguration): Promise<void> {
return new Promise<void>(resolve => {
if ((window as any).dwr) {
resolve();
if ( configuration.useMoment ) {
shimDwrThenResolve( resolve );
} else {
resolve();
}
} else {
const path = `${configuration.path}/engine.js`;
const tag: HTMLScriptElement = document.createElement('script');
tag.src = path;
tag.type = 'text/javascript';
tag.onload = () => resolve();
tag.onerror = () => resolve();
if ( configuration.useMoment ) {
tag.onload = () => shimDwrThenResolve( resolve );
tag.onerror = () => shimDwrThenResolve( resolve );
} else {
tag.onload = () => resolve();
tag.onerror = () => resolve();
}
document.body.appendChild(tag);
}
});
}

/**
* Intercepta as chamadas de convert do dwr para converter o tipo Moment para Date caso ele esteja sendo utilizado
* @param resolve
*/
function shimDwrThenResolve(resolve: Function) {
(function(dwr) {
const original = dwr.engine.serialize.convert;
dwr.engine.serialize.convert = function(batch, directrefmap, otherrefmap, data, name, depth) {
if (data != null && typeof data == 'object' && data._isAMomentObject) {
original(batch, directrefmap, otherrefmap, data.toDate(), name, depth);
} else {
original(batch, directrefmap, otherrefmap, data, name, depth);
}
};
})(window['dwr']);

resolve();
}

function loadServiceIfNeeded(configuration: BrokerConfiguration, name: string): Promise<any> {
return new Promise<any>(resolve => {
Expand Down