Skip to content

perf: reduce standard module bundle size #157

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

Merged
merged 1 commit into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { OpenGraphImage } from './open-graph-image'
import { OpenGraph } from './open-graph'
import { OPEN_GRAPH_IMAGE_SETTER_FACTORY } from './open-graph-image-metadata-provider'

describe('Open Graph image metadata', () => {
describe('Open Graph image metadata provider', () => {
enableAutoSpy()
let sut: MetadataSetter<OpenGraph['image']>
let metaService: jasmine.SpyObj<MetaService>
Expand Down
20 changes: 10 additions & 10 deletions projects/ngx-meta/src/standard/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ export { StandardModule as NgxMetaStandardModule } from './src/standard.module'
export { provideStandard as provideNgxMetaStandardMetadata } from './src/provide-standard'
export * from './src/html-lang-attribute/html-lang-attribute.service'
export * from './src/link-rel-canonical/link-rel-canonical.service'
export * from './src/standard-metadata-route-data'
// Specific metadata
export * from './src/title-standard-metadata.service'
export * from './src/description-standard-metadata.service'
export * from './src/author-standard-metadata.service'
export * from './src/keywords-standard-metadata.service'
export * from './src/generator-standard-metadata.service'
export * from './src/application-name-standard-metadata.service'
export * from './src/canonical-url-standard-metadata.service'
export * from './src/locale-standard-metadata.service'
export * from './src/standard-metadata'
// Specific providers
export * from './src/standard-title-metadata-provider'
export * from './src/standard-description-metadata-provider'
export * from './src/standard-author-metadata-provider'
export * from './src/standard-keywords-metadata-provider'
export * from './src/standard-generator-metadata-provider'
export * from './src/standard-application-name-metadata-provider'
export * from './src/standard-canonical-url-metadata-provider'
export * from './src/standard-locale-metadata-provider'

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions projects/ngx-meta/src/standard/src/base-standard-metadata.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Inject, Injectable } from '@angular/core'
import { DOCUMENT } from '@angular/common'
import { StandardMetadata } from '../standard-metadata'
import { Standard } from '../standard'

@Injectable()
export class HtmlLangAttributeService {
private readonly attributeName = 'lang'

constructor(@Inject(DOCUMENT) private readonly document: Document) {}

set(locale: StandardMetadata['locale']) {
set(locale: Standard['locale']) {
const htmlElement = this.document.documentElement
if (locale === null || locale === undefined) {
htmlElement.removeAttribute(this.attributeName)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Inject, Injectable } from '@angular/core'
import { DOCUMENT } from '@angular/common'
import { StandardMetadata } from '../standard-metadata'
import { Standard } from '../standard'

/**
* Manages the <link rel='canonical'> HTML meta tag
Expand All @@ -12,7 +12,7 @@ import { StandardMetadata } from '../standard-metadata'
export class LinkRelCanonicalService {
constructor(@Inject(DOCUMENT) private readonly document: Document) {}

set(url: StandardMetadata['canonicalUrl']) {
set(url: Standard['canonicalUrl']) {
const existingLinkElement = this.getElement()
if (existingLinkElement) {
this.document.head.removeChild(existingLinkElement)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {
GlobalMetadataKey,
MetadataSetterFactory,
MetaService,
provideMetadataFactory,
StringKeyOf,
} from '@davidlj95/ngx-meta/core'
import { FactoryProvider } from '@angular/core'
import { Standard } from './standard'
import { StandardMetadataDefinition } from './standard-metadata-definition'
import { StandardMetaProperty } from './standard-meta-property'

export const makeStandardMetadataProvider = <Key extends StringKeyOf<Standard>>(
key: Key,
opts: {
// Standard metadata name. Defaults to key
n?: string
// Global key. Defaults to nothing
g?: GlobalMetadataKey
// Setter factory. Defaults to setting the meta name to the given value.
s?: MetadataSetterFactory<Standard[typeof key]>
// Deps for the setter factory
d?: FactoryProvider['deps']
} = {},
): FactoryProvider =>
provideMetadataFactory(
new StandardMetadataDefinition(key, opts.g),
opts.s ??
((metaService) => (value: Standard[typeof key]) =>
metaService.set(new StandardMetaProperty(opts.n ?? key), value)),
[opts.d ?? MetaService],
)
33 changes: 16 additions & 17 deletions projects/ngx-meta/src/standard/src/provide-standard.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
import { Provider } from '@angular/core'
import { provideMetadata } from '@davidlj95/ngx-meta/core'
import { TitleStandardMetadata } from './title-standard-metadata.service'
import { DescriptionStandardMetadata } from './description-standard-metadata.service'
import { AuthorStandardMetadata } from './author-standard-metadata.service'
import { KeywordsStandardMetadata } from './keywords-standard-metadata.service'
import { GeneratorStandardMetadata } from './generator-standard-metadata.service'
import { ApplicationNameStandardMetadata } from './application-name-standard-metadata.service'
import { CanonicalUrlStandardMetadata } from './canonical-url-standard-metadata.service'
import { LinkRelCanonicalService } from './link-rel-canonical/link-rel-canonical.service'
import { LocaleStandardMetadata } from './locale-standard-metadata.service'
import { HtmlLangAttributeService } from './html-lang-attribute/html-lang-attribute.service'
import { STANDARD_TITLE_METADATA_PROVIDER } from './standard-title-metadata-provider'
import { STANDARD_DESCRIPTION_METADATA_PROVIDER } from './standard-description-metadata-provider'
import { STANDARD_AUTHOR_METADATA_PROVIDER } from './standard-author-metadata-provider'
import { STANDARD_KEYWORDS_METADATA_PROVIDER } from './standard-keywords-metadata-provider'
import { STANDARD_GENERATOR_METADATA_PROVIDER } from './standard-generator-metadata-provider'
import { STANDARD_APPLICATION_NAME_METADATA_PROVIDER } from './standard-application-name-metadata-provider'
import { STANDARD_CANONICAL_URL_METADATA_PROVIDER } from './standard-canonical-url-metadata-provider'
import { STANDARD_LOCALE_METADATA_PROVIDER } from './standard-locale-metadata-provider'

export function provideStandard(): Provider[] {
return [
provideMetadata(TitleStandardMetadata),
provideMetadata(DescriptionStandardMetadata),
provideMetadata(AuthorStandardMetadata),
provideMetadata(KeywordsStandardMetadata),
provideMetadata(GeneratorStandardMetadata),
provideMetadata(ApplicationNameStandardMetadata),
provideMetadata(CanonicalUrlStandardMetadata),
STANDARD_TITLE_METADATA_PROVIDER,
STANDARD_DESCRIPTION_METADATA_PROVIDER,
STANDARD_AUTHOR_METADATA_PROVIDER,
STANDARD_KEYWORDS_METADATA_PROVIDER,
STANDARD_GENERATOR_METADATA_PROVIDER,
STANDARD_APPLICATION_NAME_METADATA_PROVIDER,
STANDARD_CANONICAL_URL_METADATA_PROVIDER,
LinkRelCanonicalService,
provideMetadata(LocaleStandardMetadata),
STANDARD_LOCALE_METADATA_PROVIDER,
HtmlLangAttributeService,
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { makeStandardMetadataProvider } from './make-standard-metadata-provider'
import { Standard } from './standard'

const KEY: keyof Standard = 'applicationName'

export const STANDARD_APPLICATION_NAME_METADATA_PROVIDER =
makeStandardMetadataProvider(KEY, { g: KEY, n: 'application-name' })
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { makeStandardMetadataProvider } from './make-standard-metadata-provider'
import { Standard } from './standard'

const KEY: keyof Standard = 'author'

export const STANDARD_AUTHOR_METADATA_PROVIDER =
makeStandardMetadataProvider(KEY)
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { makeStandardMetadataProvider } from './make-standard-metadata-provider'
import { Standard } from './standard'
import { LinkRelCanonicalService } from './link-rel-canonical/link-rel-canonical.service'

const KEY: keyof Standard = 'canonicalUrl'

export const STANDARD_CANONICAL_URL_METADATA_PROVIDER =
makeStandardMetadataProvider(KEY, {
g: KEY,
s: (linkRelCanonicalService: LinkRelCanonicalService) => (value) =>
linkRelCanonicalService.set(value),
d: [LinkRelCanonicalService],
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { makeStandardMetadataProvider } from './make-standard-metadata-provider'
import { Standard } from './standard'

const KEY: keyof Standard = 'description'

export const STANDARD_DESCRIPTION_METADATA_PROVIDER =
makeStandardMetadataProvider(KEY, { g: KEY })
Loading