2
0
mirror of https://github.com/tenrok/vue-meta.git synced 2026-06-15 09:22:25 +03:00

fix: consolidate types

This commit is contained in:
pimlie
2021-02-01 00:08:28 +01:00
parent 616d6b4db6
commit 45704e0a31
68 changed files with 1120 additions and 1082 deletions
+5 -2
View File
@@ -4,7 +4,10 @@
],
"globals": {
"__DEV__": true,
"__BROWSER__": false,
"__BROWSER__": false
},
"rules": {
"spaced-comment": ["error", "always", { "exceptions": ["#__PURE__"] }]
},
"overrides": [
{
@@ -12,7 +15,7 @@
"examples/**"
],
"rules": {
"no-console": "off",
"no-console": "off"
}
}
]
+1 -1
View File
@@ -2,6 +2,6 @@
"commit-all": true,
"scripts": {
"postbump": "yarn build",
"precommit": "git add -f dist/*"
"precommit": "git add -f dist/*.js dist/*.d.ts"
}
}
-12
View File
@@ -1,12 +0,0 @@
import { VNodeProps } from 'vue';
import { MetainfoActive } from './types';
export interface MetainfoProps {
metainfo: MetainfoActive;
}
export declare const MetainfoImpl: import("vue").DefineComponent<{}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
[key: string]: any;
}>[] | undefined, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{} & {}>, {}>;
export declare const Metainfo: new () => {
$props: VNodeProps & MetainfoProps;
};
//# sourceMappingURL=Metainfo.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"Metainfo.d.ts","sourceRoot":"","sources":["../../src/Metainfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,UAAU,EAAE,MAAM,KAAK,CAAA;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED,eAAO,MAAM,YAAY;;yPAavB,CAAA;AAEF,eAAO,MAAM,QAAQ,YACX;IACN,MAAM,EAAE,UAAU,GAAG,aAAa,CAAA;CAErC,CAAA"}
-3
View File
@@ -1,3 +0,0 @@
import { Config } from '../types';
export declare const defaultConfig: Config;
//# sourceMappingURL=default.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../../src/config/default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,eAAO,MAAM,aAAa,EAAE,MAoC3B,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
import { Config } from '../types';
export declare function hasConfig(name: string, config: Config): boolean;
export declare function getConfigByKey(tagOrName: string | Array<string>, key: string, config: Config): any;
//# sourceMappingURL=helpers.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/config/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAGjC,wBAAgB,SAAS,CAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,GAAG,CAmBL"}
-4
View File
@@ -1,4 +0,0 @@
export * from './default';
export * from './helpers';
export * from './tags';
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,QAAQ,CAAA"}
-11
View File
@@ -1,11 +0,0 @@
export interface TagConfig {
keyAttribute?: string;
contentAsAttribute?: boolean | string;
attributes: boolean | Array<string>;
[key: string]: any;
}
declare const tags: {
[key: string]: TagConfig;
};
export { tags };
//# sourceMappingURL=tags.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"tags.d.ts","sourceRoot":"","sources":["../../../src/config/tags.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,SAAS;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IACrC,UAAU,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;IACnC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB;AAED,QAAA,MAAM,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAiDrC,CAAA;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
-9
View File
@@ -1,9 +0,0 @@
import * as deepestResolver from './resolvers/deepest';
export { defaultConfig } from './config';
export { createMetaManager } from './manager';
export { resolveOption } from './resolvers';
export * from './ssr';
export * from './types';
export * from './useApi';
export { deepestResolver };
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,eAAe,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3C,cAAc,OAAO,CAAA;AACrB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AAExB,OAAO,EACL,eAAe,EAChB,CAAA"}
-8
View File
@@ -1,8 +0,0 @@
import { VNode } from 'vue';
import type { ResolveMethod } from './object-merge';
import type { Manager, Config, Resolver, MetainfoActive } from './types';
export declare const ssrAttribute = "data-vm-ssr";
export declare const active: MetainfoActive;
export declare function addVnode(teleports: any, to: string, _vnodes: VNode | Array<VNode>): void;
export declare function createMetaManager(config: Config, resolver: Resolver | ResolveMethod): Manager;
//# sourceMappingURL=manager.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,EAAW,MAAM,KAAK,CAAA;AAMxE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,SAAS,CAAA;AAErF,eAAO,MAAM,YAAY,gBAAgB,CAAA;AAEzC,eAAO,MAAM,MAAM,EAAE,cAA6B,CAAA;AAElD,wBAAgB,QAAQ,CAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,QA2BlF;AAED,wBAAgB,iBAAiB,CAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,aAAa,GAAG,OAAO,CAsG9F"}
-5
View File
@@ -1,5 +0,0 @@
export declare const IS_PROXY: string;
export declare const PROXY_SOURCES: string;
export declare const PROXY_TARGET: string;
export declare const RESOLVE_CONTEXT: string;
//# sourceMappingURL=constants.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/object-merge/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,QAAQ,QAA0C,CAAA;AAC/D,eAAO,MAAM,aAAa,QAA+C,CAAA;AACzE,eAAO,MAAM,YAAY,QAA8C,CAAA;AACvE,eAAO,MAAM,eAAe,QAAiD,CAAA"}
-25
View File
@@ -1,25 +0,0 @@
export declare type MergeSource = {
[key: string]: any;
};
export declare type MergedObjectValue = boolean | number | string | MergedObject | any;
export declare type MergedObject = {
[key: string]: MergedObjectValue;
};
export declare type PathSegments = Array<string>;
export declare type ResolveContext = {};
export declare type ResolveMethod = (options: Array<any>, contexts: Array<ResolveContext>, active: MergedObjectValue, key: string | number | symbol, pathSegments: PathSegments) => MergedObjectValue;
export declare type MergeContext = {
resolve: ResolveMethod;
active: MergedObject;
sources: Array<MergeSource>;
};
export declare const createMergedObject: (resolve: ResolveMethod, active?: MergedObject) => {
context: MergeContext;
active: MergedObject;
resolve: ResolveMethod;
sources: MergeSource[];
addSource: (source: MergeSource, resolveContext: ResolveContext | undefined, recompute?: Boolean) => any;
delSource: (sourceOrProxy: MergeSource, recompute?: boolean) => boolean;
compute: () => void;
};
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/object-merge/index.ts"],"names":[],"mappings":"AAIA,oBAAY,WAAW,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB,CAAA;AAGD,oBAAY,iBAAiB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,YAAY,GAAG,GAAG,CAAA;AAE9E,oBAAY,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAA;CACjC,CAAA;AAED,oBAAY,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;AAExC,oBAAY,cAAc,GAAG,EAAE,CAAA;AAE/B,oBAAY,aAAa,GAAG,CAC1B,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EACnB,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,EAC/B,MAAM,EAAE,iBAAiB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAC7B,YAAY,EAAE,YAAY,KACvB,iBAAiB,CAAA;AAEtB,oBAAY,YAAY,GAAG;IACzB,OAAO,EAAE,aAAa,CAAA;IACtB,MAAM,EAAE,YAAY,CAAA;IACpB,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,kBAAkB,YAAa,aAAa,WAAU,YAAY;;;;;wBAelD,WAAW,kBAAkB,cAAc,GAAG,SAAS,cAAa,OAAO;+BAUpE,WAAW,cAAa,OAAO,KAAU,OAAO;;CAyBnF,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
import type { MergeContext, MergeSource, PathSegments, ResolveContext } from '.';
export declare const createProxy: (context: MergeContext, target: MergeSource, resolveContext: ResolveContext, pathSegments?: PathSegments) => any;
export declare const createHandler: (context: MergeContext, resolveContext: ResolveContext, pathSegments: PathSegments) => ProxyHandler<any>;
//# sourceMappingURL=proxy.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/object-merge/proxy.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAqB,YAAY,EAAE,cAAc,EAAE,MAAM,GAAG,CAAA;AAEnG,eAAO,MAAM,WAAW,YAAa,YAAY,UAAU,WAAW,kBAAkB,cAAc,qCASrG,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,KAAK,YAAY,CAAC,GAAG,CA2KjI,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
import type { MergeContext, MergeSource, MergedObject, PathSegments } from '.';
export declare const allKeys: (source?: MergeSource | undefined, ...sources: Array<MergeSource>) => Array<string>;
export declare const recompute: (context: MergeContext, sources?: MergeSource[] | undefined, target?: MergedObject | undefined, path?: PathSegments) => void;
//# sourceMappingURL=recompute.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"recompute.d.ts","sourceRoot":"","sources":["../../../src/object-merge/recompute.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,GAAG,CAAA;AAE9F,eAAO,MAAM,OAAO,iDAAsC,MAAM,WAAW,CAAC,KAAG,MAAM,MAAM,CAoB1F,CAAA;AAED,eAAO,MAAM,SAAS,YAAa,YAAY,kGAAiF,IAkE/H,CAAA"}
-29
View File
@@ -1,29 +0,0 @@
import { VNode } from 'vue';
import { TODO } from './types';
export interface RenderContext {
slots: any;
[key: string]: TODO;
}
export interface GroupConfig {
group: string;
data: Array<TODO> | TODO;
tagNamespace?: string;
fullName?: string;
slotName?: string;
}
export interface SlotScopeProperties {
content: any;
metainfo: any;
[key: string]: any;
}
export declare type RenderedMetainfoNode = {
vnode: VNode;
to?: string;
};
export declare type RenderedMetainfo = Array<RenderedMetainfoNode>;
export declare function renderMeta(context: RenderContext, key: string, data: TODO, config: TODO): void | RenderedMetainfo | RenderedMetainfoNode;
export declare function renderGroup(context: RenderContext, key: string, data: TODO, config: TODO): RenderedMetainfo | RenderedMetainfoNode;
export declare function renderTag(context: RenderContext, key: string, data: TODO, config?: TODO, groupConfig?: GroupConfig): RenderedMetainfo | RenderedMetainfoNode;
export declare function renderAttributes(context: RenderContext, key: string, data: TODO, config?: TODO): RenderedMetainfoNode | void;
export declare function getSlotContent({ metainfo, slots }: RenderContext, slotName: string, content: any, groupConfig?: GroupConfig): TODO;
//# sourceMappingURL=render.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,EAAE,MAAM,KAAK,CAAA;AAG9B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAS9B,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,GAAG,CAAA;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,GAAG,CAAA;IACZ,QAAQ,EAAE,GAAG,CAAA;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CACnB;AAED,oBAAY,oBAAoB,GAAG;IACjC,KAAK,EAAE,KAAK,CAAA;IACZ,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,oBAAY,gBAAgB,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAA;AAE1D,wBAAgB,UAAU,CACxB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,IAAI,GACX,IAAI,GAAG,gBAAgB,GAAG,oBAAoB,CAYhD;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,IAAI,GACX,gBAAgB,GAAG,oBAAoB,CAgCzC;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,IAAS,EACjB,WAAW,CAAC,EAAE,WAAW,GACxB,gBAAgB,GAAG,oBAAoB,CA8HzC;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,IAAI,EACV,MAAM,GAAE,IAAS,GAChB,oBAAoB,GAAG,IAAI,CAkD7B;AAED,wBAAgB,cAAc,CAC5B,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,aAAa,EAClC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,GAAG,EACZ,WAAW,CAAC,EAAE,WAAW,GACxB,IAAI,CAqBN"}
-9
View File
@@ -1,9 +0,0 @@
import { ResolveMethod } from '../object-merge';
import { MetaContext } from '../types';
declare type MergeContextDeepest = MetaContext & {
depth: number;
};
export declare function setup(context: MergeContextDeepest): void;
export declare const resolve: ResolveMethod;
export {};
//# sourceMappingURL=deepest.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"deepest.d.ts","sourceRoot":"","sources":["../../../src/resolvers/deepest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGtC,aAAK,mBAAmB,GAAG,WAAW,GAAG;IACvC,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,wBAAgB,KAAK,CAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAgBzD;AAED,eAAO,MAAM,OAAO,EAAE,aAKpB,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
import { ResolveContext, ResolveMethod } from '../object-merge';
export declare type ResolveOptionReducer = (accumulator: any, context: ResolveContext) => ResolveMethod;
export declare const resolveOption: (predicament: ResolveOptionReducer) => ResolveMethod;
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/D,oBAAY,oBAAoB,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,KAAK,aAAa,CAAA;AAE/F,eAAO,MAAM,aAAa,EAAE,CAAC,WAAW,EAAE,oBAAoB,KAAK,aAiBlE,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
import type { App } from 'vue';
import type { SSRContext } from '@vue/server-renderer';
export declare function renderToStringWithMeta(app: App): Promise<[string, SSRContext]>;
//# sourceMappingURL=ssr.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../src/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAKtD,wBAAsB,sBAAsB,CAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAsBrF"}
-6
View File
@@ -1,6 +0,0 @@
import { InjectionKey } from 'vue';
import { MetainfoActive } from './types';
export declare const hasSymbol: boolean;
export declare const PolySymbol: (name: string) => string | symbol;
export declare const metaInfoKey: InjectionKey<MetainfoActive>;
//# sourceMappingURL=symbols.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"symbols.d.ts","sourceRoot":"","sources":["../../src/symbols.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,eAAO,MAAM,SAAS,SACkD,CAAA;AAExE,eAAO,MAAM,UAAU,SAAU,MAAM,oBAIM,CAAA;AAE7C,eAAO,MAAM,WAAW,8BAES,CAAA"}
-59
View File
@@ -1,59 +0,0 @@
import type { App, VNode, ComponentInternalInstance } from 'vue';
import type { MergedObject, ResolveContext, ResolveMethod } from '../object-merge';
export declare type TODO = any;
export declare type MetainfoInput = {
[key: string]: TODO;
};
export declare type MetaContext = ResolveContext & {
vm: ComponentInternalInstance | undefined;
};
export interface ConfigOption {
tag?: string;
to?: string;
group?: boolean;
keyAttribute?: string;
valueAttribute?: string;
nameless?: boolean;
namespaced?: boolean;
namespacedAttribute?: boolean;
attributesFor?: string;
}
export interface Config {
[key: string]: ConfigOption;
}
export interface MetainfoProxy extends MergedObject {
}
export interface MetainfoActive {
[key: string]: TODO;
}
export declare type MetaProxy = {
meta: MetainfoProxy;
unmount: TODO;
};
export declare type ResolveSetup = (context: MetaContext) => void;
export declare type Resolver = {
setup?: ResolveSetup;
resolve: ResolveMethod;
};
export declare type Manager = {
readonly config: Config;
install(app: App): void;
addMeta(obj: MetainfoInput, vm?: ComponentInternalInstance): MetaProxy;
render(ctx: {
slots?: any;
}): Array<VNode>;
};
declare module '@vue/runtime-core' {
interface ComponentInternalInstance {
$metaManager: Manager;
}
}
declare global {
namespace NodeJS {
interface Process {
client: boolean;
server: boolean;
}
}
}
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,MAAM,KAAK,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAElF,oBAAY,IAAI,GAAG,GAAG,CAAA;AAEtB,oBAAY,aAAa,GAAG;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB,CAAA;AAED,oBAAY,WAAW,GAAG,cAAc,GAAG;IACzC,EAAE,EAAE,yBAAyB,GAAG,SAAS,CAAA;CAC1C,CAAA;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,MAAM,WAAW,MAAM;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;CAC5B;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;CAElD;AAED,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CACpB;AAED,oBAAY,SAAS,GAAG;IACtB,IAAI,EAAE,aAAa,CAAA;IACnB,OAAO,EAAE,IAAI,CAAA;CACd,CAAA;AAED,oBAAY,YAAY,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAA;AAEzD,oBAAY,QAAQ,GAAG;IACrB,KAAK,CAAC,EAAE,YAAY,CAAA;IACpB,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAED,oBAAY,OAAO,GAAG;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IAEvB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAA;IACvB,OAAO,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAA;IAEtE,MAAM,CAAC,GAAG,EAAE;QAAE,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;CAC3C,CAAA;AAED,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAU,yBAAyB;QACjC,YAAY,EAAE,OAAO,CAAA;KACtB;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAU,OAAO;YACf,MAAM,EAAE,OAAO,CAAA;YACf,MAAM,EAAE,OAAO,CAAA;SAChB;KACF;CACF"}
-6
View File
@@ -1,6 +0,0 @@
import { ComponentInternalInstance } from 'vue';
import type { Manager, MetainfoActive, MetainfoInput, MetaProxy } from './types';
export declare function getCurrentManager(vm?: ComponentInternalInstance): Manager;
export declare function useMeta(obj: MetainfoInput, manager?: Manager): MetaProxy;
export declare function useMetainfo(): MetainfoActive;
//# sourceMappingURL=useApi.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"useApi.d.ts","sourceRoot":"","sources":["../../src/useApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,yBAAyB,EAAE,MAAM,KAAK,CAAA;AAE3E,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEhF,wBAAgB,iBAAiB,CAAE,EAAE,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAM1E;AAED,wBAAgB,OAAO,CAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAazE;AAED,wBAAgB,WAAW,IAAK,cAAc,CAE7C"}
-2
View File
@@ -1,2 +0,0 @@
export declare function clone(v: any): any;
//# sourceMappingURL=clone.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"clone.d.ts","sourceRoot":"","sources":["../../../src/utils/clone.ts"],"names":[],"mappings":"AAGA,wBAAgB,KAAK,CAAE,CAAC,EAAE,GAAG,GAAG,GAAG,CAoBlC"}
-2
View File
@@ -1,2 +0,0 @@
export declare const pluck: (collection: Array<any>, key: string, callback?: ((row: any) => void) | undefined) => any[];
//# sourceMappingURL=collection.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utils/collection.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,KAAK,eAAgB,MAAM,GAAG,CAAC,OAAO,MAAM,oBAAmB,GAAG,KAAK,IAAI,uBAcvF,CAAA"}
-13
View File
@@ -1,13 +0,0 @@
interface DebugInterface {
(...args: any[]): void;
warn: Function;
error: Function;
}
export declare const debugFn: (logFn: Function, setChildFns?: boolean) => {
(...args: any[]): void;
warn: any;
error: any;
};
export declare const debug: DebugInterface;
export {};
//# sourceMappingURL=debug.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/utils/debug.ts"],"names":[],"mappings":"AACA,UAAU,cAAc;IACtB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IACtB,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,QAAQ,CAAA;CAChB;AAED,eAAO,MAAM,OAAO,UAAW,QAAQ,gBAAe,OAAO;cACtC,GAAG,EAAE;;;CAc3B,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,cAA2C,CAAA"}
-4
View File
@@ -1,4 +0,0 @@
export * from './clone';
export * from './collection';
export * from './debug';
//# sourceMappingURL=index.d.ts.map
-1
View File
@@ -1 +0,0 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA"}
+116 -113
View File
@@ -91,29 +91,8 @@ const defaultConfig = {
}
};
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
const tags = {
title: {
@@ -166,24 +145,34 @@ const tags = {
}
};
function getConfigByKey(tagOrName, key, config) {
if (config && key in config) {
return config[key];
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key];
}
function getTagConfigItem(tagOrName, key) {
for (const name of tagOrName) {
const tag = tags[name];
if (name && tag) {
return tag[key];
}
return;
}
if (tagOrName in tags) {
const tag = tags[tagOrName];
return tag[key];
}
}
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
// https://github.com/microsoft/TypeScript/issues/1863
const IS_PROXY = Symbol('kIsProxy');
const PROXY_SOURCES = Symbol('kProxySources');
@@ -443,41 +432,36 @@ const createMergedObject = (resolve, active = {}) => {
sources
};
const compute = () => recompute(context);
const addSource = (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return proxy;
};
const delSource = (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return true;
return proxy;
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
if (recompute) {
compute();
}
return true;
}
return false;
}
return false;
};
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
};
};
function renderMeta(context, key, data, config) {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config);
}
if (config.group) {
if ('group' in config) {
return renderGroup(context, key, data, config);
}
return renderTag(context, key, data, config);
@@ -487,7 +471,7 @@ function renderGroup(context, key, data, config) {
if (isArray(data)) {
{
// eslint-disable-next-line no-console
console.warn('Specifying an array for group properties isnt supported mostly as we didnt found a use-case for this yet. If you have one, please create an issue on the vue-meta repo');
console.warn('Specifying an array for group properties isnt supported');
}
// config.attributes = getConfigKey([key, config.tag], 'attributes', config)
return [];
@@ -513,7 +497,7 @@ function renderGroup(context, key, data, config) {
function renderTag(context, key, data, config = {}, groupConfig) {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent'];
const getConfig = (key) => getConfigByKey([tag, config.tag], key, config);
const getTagConfig = (key) => getTagConfigItem([tag, config.tag], key);
if (isArray(data)) {
return data
.map((child) => {
@@ -522,7 +506,7 @@ function renderTag(context, key, data, config = {}, groupConfig) {
.flat();
}
const { tag = config.tag || key } = data;
let content;
let content = '';
let hasChilds = false;
let isRaw = false;
if (isString(data)) {
@@ -574,24 +558,24 @@ function renderTag(context, key, data, config = {}, groupConfig) {
content = getSlotContent(context, slotName, content, data);
}
else {
const contentAsAttribute = getConfig('contentAsAttribute');
let valueAttribute = config.valueAttribute;
const contentAsAttribute = !!getTagConfig('contentAsAttribute');
let { valueAttribute } = config;
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0];
const [tagAttribute] = getTagConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute;
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data);
}
else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute');
const { nameless, keyAttribute } = config;
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName;
}
}
attributes[valueAttribute] = getSlotContent(context, slotName, attributes[valueAttribute] || content, groupConfig);
content = undefined;
content = '';
}
}
const finalTag = groupConfig && groupConfig.tagNamespace
@@ -601,22 +585,22 @@ function renderTag(context, key, data, config = {}, groupConfig) {
// console.log(' ATTRIBUTES', attributes)
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode;
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content;
vnode = vue.h(finalTag, attributes);
}
else {
vnode = vue.h(finalTag, attributes, content);
}
// Ignore empty string content
const vnode = vue.h(finalTag, attributes, content || undefined);
return {
to: data.to,
vnode
};
}
function renderAttributes(context, key, data, config = {}) {
function renderAttributes(context, key, data, config) {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config;
if (!attributesFor) {
return;
}
{
// render attributes in a placeholder vnode so Vue
// will render the string for us
@@ -627,19 +611,22 @@ function renderAttributes(context, key, data, config = {}) {
}
}
function getSlotContent({ metainfo, slots }, slotName, content, groupConfig) {
if (!slots || !slots[slotName]) {
const slot = slots && slots[slotName];
if (!slot) {
return content;
}
const slotProps = {
const slotScopeProps = {
content,
metainfo
};
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data;
const { group, data } = groupConfig;
slotScopeProps[group] = data;
}
const slotContent = slots[slotName](slotProps);
const slotContent = slot(slotScopeProps);
if (slotContent && slotContent.length) {
return slotContent[0].children;
const { children } = slotContent[0];
return children ? children.toString() : '';
}
return content;
}
@@ -650,15 +637,18 @@ const PolySymbol = (name) =>
hasSymbol
? Symbol( '[vue-meta]: ' + name )
: ( '[vue-meta]: ' ) + name;
const metaInfoKey = PolySymbol( 'metainfo' );
const metaActiveKey = /*#__PURE__*/ PolySymbol( 'active_meta' );
function getCurrentManager(vm) {
if (!vm) {
vm = vue.getCurrentInstance();
vm = vue.getCurrentInstance() || undefined;
}
if (!vm) {
return undefined;
}
return vm.appContext.config.globalProperties.$metaManager;
}
function useMeta(obj, manager) {
function useMeta(source, manager) {
const vm = vue.getCurrentInstance();
if (!manager && vm) {
manager = getCurrentManager(vm);
@@ -667,10 +657,10 @@ function useMeta(obj, manager) {
// oopsydoopsy
throw new Error('No manager or current instance');
}
return manager.addMeta(obj, vm || undefined);
return manager.addMeta(source, vm || undefined);
}
function useMetainfo() {
return vue.inject(metaInfoKey);
function useActiveMeta() {
return vue.inject(metaActiveKey);
}
const MetainfoImpl = vue.defineComponent({
@@ -690,23 +680,20 @@ const Metainfo = MetainfoImpl;
const ssrAttribute = 'data-vm-ssr';
const active = vue.reactive({});
function addVnode(teleports, to, _vnodes) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]);
{
// dont add ssrAttribute for attribute vnode placeholder
if (!to.endsWith('Attrs')) {
vnodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
function addVnode(teleports, to, vnodes) {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]);
if (!to.endsWith('Attrs')) {
nodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
if (!teleports[to]) {
teleports[to] = [];
}
teleports[to].push(...vnodes);
teleports[to].push(...nodes);
}
function createMetaManager(config, resolver) {
const resolve = (options, contexts, active, key, pathSegments) => {
@@ -722,9 +709,12 @@ function createMetaManager(config, resolver) {
install(app) {
app.component('Metainfo', Metainfo);
app.config.globalProperties.$metaManager = manager;
app.provide(metaInfoKey, active);
app.provide(metaActiveKey, active);
},
addMeta(metaObj, vm) {
if (!vm) {
vm = vue.getCurrentInstance() || undefined;
}
const resolveContext = { vm };
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext);
@@ -744,21 +734,34 @@ function createMetaManager(config, resolver) {
const teleports = {};
for (const key in active) {
const config = this.config[key] || {};
const vnode = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!vnode) {
let renderedNodes = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!renderedNodes) {
continue;
}
const vnodes = isArray(vnode) ? vnode : [vnode];
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head');
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode);
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes];
}
let defaultTo = key !== 'base' && active[key].to;
if (!defaultTo && 'to' in config) {
defaultTo = config.to;
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key;
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode);
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag];
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }));
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName;
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue;
}
const slot = slots[slotName];
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }));
}
}
}
@@ -770,7 +773,7 @@ function createMetaManager(config, resolver) {
return manager;
}
// rollup doesnt like an import, cant find export so use require
// rollup doesnt like an import as it cant find the export so use require
const { renderToString } = require('@vue/server-renderer');
async function renderToStringWithMeta(app) {
const ctx = {};
@@ -797,5 +800,5 @@ exports.defaultConfig = defaultConfig;
exports.getCurrentManager = getCurrentManager;
exports.renderToStringWithMeta = renderToStringWithMeta;
exports.resolveOption = resolveOption;
exports.useActiveMeta = useActiveMeta;
exports.useMeta = useMeta;
exports.useMetainfo = useMetainfo;
+115 -112
View File
@@ -91,29 +91,8 @@ const defaultConfig = {
}
};
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
const tags = {
title: {
@@ -166,24 +145,34 @@ const tags = {
}
};
function getConfigByKey(tagOrName, key, config) {
if (config && key in config) {
return config[key];
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key];
}
function getTagConfigItem(tagOrName, key) {
for (const name of tagOrName) {
const tag = tags[name];
if (name && tag) {
return tag[key];
}
return;
}
if (tagOrName in tags) {
const tag = tags[tagOrName];
return tag[key];
}
}
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
// https://github.com/microsoft/TypeScript/issues/1863
const IS_PROXY = Symbol('kIsProxy');
const PROXY_SOURCES = Symbol('kProxySources');
@@ -443,41 +432,36 @@ const createMergedObject = (resolve, active = {}) => {
sources
};
const compute = () => recompute(context);
const addSource = (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return proxy;
};
const delSource = (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return true;
return proxy;
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
if (recompute) {
compute();
}
return true;
}
return false;
}
return false;
};
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
};
};
function renderMeta(context, key, data, config) {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config);
}
if (config.group) {
if ('group' in config) {
return renderGroup(context, key, data, config);
}
return renderTag(context, key, data, config);
@@ -509,7 +493,7 @@ function renderGroup(context, key, data, config) {
function renderTag(context, key, data, config = {}, groupConfig) {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent'];
const getConfig = (key) => getConfigByKey([tag, config.tag], key, config);
const getTagConfig = (key) => getTagConfigItem([tag, config.tag], key);
if (isArray(data)) {
return data
.map((child) => {
@@ -518,7 +502,7 @@ function renderTag(context, key, data, config = {}, groupConfig) {
.flat();
}
const { tag = config.tag || key } = data;
let content;
let content = '';
let hasChilds = false;
let isRaw = false;
if (isString(data)) {
@@ -570,24 +554,24 @@ function renderTag(context, key, data, config = {}, groupConfig) {
content = getSlotContent(context, slotName, content, data);
}
else {
const contentAsAttribute = getConfig('contentAsAttribute');
let valueAttribute = config.valueAttribute;
const contentAsAttribute = !!getTagConfig('contentAsAttribute');
let { valueAttribute } = config;
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0];
const [tagAttribute] = getTagConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute;
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data);
}
else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute');
const { nameless, keyAttribute } = config;
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName;
}
}
attributes[valueAttribute] = getSlotContent(context, slotName, attributes[valueAttribute] || content, groupConfig);
content = undefined;
content = '';
}
}
const finalTag = groupConfig && groupConfig.tagNamespace
@@ -597,22 +581,22 @@ function renderTag(context, key, data, config = {}, groupConfig) {
// console.log(' ATTRIBUTES', attributes)
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode;
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content;
vnode = vue.h(finalTag, attributes);
}
else {
vnode = vue.h(finalTag, attributes, content);
}
// Ignore empty string content
const vnode = vue.h(finalTag, attributes, content || undefined);
return {
to: data.to,
vnode
};
}
function renderAttributes(context, key, data, config = {}) {
function renderAttributes(context, key, data, config) {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config;
if (!attributesFor) {
return;
}
{
// render attributes in a placeholder vnode so Vue
// will render the string for us
@@ -623,19 +607,22 @@ function renderAttributes(context, key, data, config = {}) {
}
}
function getSlotContent({ metainfo, slots }, slotName, content, groupConfig) {
if (!slots || !slots[slotName]) {
const slot = slots && slots[slotName];
if (!slot) {
return content;
}
const slotProps = {
const slotScopeProps = {
content,
metainfo
};
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data;
const { group, data } = groupConfig;
slotScopeProps[group] = data;
}
const slotContent = slots[slotName](slotProps);
const slotContent = slot(slotScopeProps);
if (slotContent && slotContent.length) {
return slotContent[0].children;
const { children } = slotContent[0];
return children ? children.toString() : '';
}
return content;
}
@@ -646,15 +633,18 @@ const PolySymbol = (name) =>
hasSymbol
? Symbol( name)
: ( '_vm_') + name;
const metaInfoKey = PolySymbol( 'mi');
const metaActiveKey = /*#__PURE__*/ PolySymbol( 'am');
function getCurrentManager(vm) {
if (!vm) {
vm = vue.getCurrentInstance();
vm = vue.getCurrentInstance() || undefined;
}
if (!vm) {
return undefined;
}
return vm.appContext.config.globalProperties.$metaManager;
}
function useMeta(obj, manager) {
function useMeta(source, manager) {
const vm = vue.getCurrentInstance();
if (!manager && vm) {
manager = getCurrentManager(vm);
@@ -663,10 +653,10 @@ function useMeta(obj, manager) {
// oopsydoopsy
throw new Error('No manager or current instance');
}
return manager.addMeta(obj, vm || undefined);
return manager.addMeta(source, vm || undefined);
}
function useMetainfo() {
return vue.inject(metaInfoKey);
function useActiveMeta() {
return vue.inject(metaActiveKey);
}
const MetainfoImpl = vue.defineComponent({
@@ -686,23 +676,20 @@ const Metainfo = MetainfoImpl;
const ssrAttribute = 'data-vm-ssr';
const active = vue.reactive({});
function addVnode(teleports, to, _vnodes) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]);
{
// dont add ssrAttribute for attribute vnode placeholder
if (!to.endsWith('Attrs')) {
vnodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
function addVnode(teleports, to, vnodes) {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]);
if (!to.endsWith('Attrs')) {
nodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
if (!teleports[to]) {
teleports[to] = [];
}
teleports[to].push(...vnodes);
teleports[to].push(...nodes);
}
function createMetaManager(config, resolver) {
const resolve = (options, contexts, active, key, pathSegments) => {
@@ -718,9 +705,12 @@ function createMetaManager(config, resolver) {
install(app) {
app.component('Metainfo', Metainfo);
app.config.globalProperties.$metaManager = manager;
app.provide(metaInfoKey, active);
app.provide(metaActiveKey, active);
},
addMeta(metaObj, vm) {
if (!vm) {
vm = vue.getCurrentInstance() || undefined;
}
const resolveContext = { vm };
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext);
@@ -740,21 +730,34 @@ function createMetaManager(config, resolver) {
const teleports = {};
for (const key in active) {
const config = this.config[key] || {};
const vnode = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!vnode) {
let renderedNodes = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!renderedNodes) {
continue;
}
const vnodes = isArray(vnode) ? vnode : [vnode];
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head');
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode);
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes];
}
let defaultTo = key !== 'base' && active[key].to;
if (!defaultTo && 'to' in config) {
defaultTo = config.to;
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key;
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode);
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag];
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }));
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName;
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue;
}
const slot = slots[slotName];
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }));
}
}
}
@@ -766,7 +769,7 @@ function createMetaManager(config, resolver) {
return manager;
}
// rollup doesnt like an import, cant find export so use require
// rollup doesnt like an import as it cant find the export so use require
const { renderToString } = require('@vue/server-renderer');
async function renderToStringWithMeta(app) {
const ctx = {};
@@ -793,5 +796,5 @@ exports.defaultConfig = defaultConfig;
exports.getCurrentManager = getCurrentManager;
exports.renderToStringWithMeta = renderToStringWithMeta;
exports.resolveOption = resolveOption;
exports.useActiveMeta = useActiveMeta;
exports.useMeta = useMeta;
exports.useMetainfo = useMetainfo;
+166
View File
@@ -0,0 +1,166 @@
import { ComponentInternalInstance, App, Slots, VNode } from 'vue';
import { SSRContext } from '@vue/server-renderer';
declare type MergedObjectValue = boolean | number | string | MergedObject | any;
declare type MergedObject = {
[key: string]: MergedObjectValue;
};
declare type PathSegments = Array<string>;
declare type ResolveContext = {};
declare type ResolveMethod = (options: Array<any>, contexts: Array<ResolveContext>, active: MergedObjectValue, key: string | number | symbol, pathSegments: PathSegments) => MergedObjectValue;
declare type MetaConfigSectionKey = 'tag' | 'to' | 'keyAttribute' | 'valueAttribute' | 'nameless' | 'group' | 'namespaced' | 'namespacedAttribute' | 'attributesFor';
interface MetaConfigSectionTag {
tag?: string;
to?: string;
keyAttribute?: string;
valueAttribute?: string;
nameless?: boolean;
}
declare type MetaConfigSectionGroup = {
group: boolean;
namespaced?: boolean;
namespacedAttribute?: boolean;
};
declare type MetaConfigSectionAttribute = {
attributesFor: string;
};
declare type MetaConfigSection = MetaConfigSectionGroup | MetaConfigSectionTag | MetaConfigSectionAttribute;
interface MetaConfig {
[key: string]: MetaConfigSection;
}
declare type MetaTagConfigKey = 'keyAttribute' | 'contentAsAttribute' | 'attributes';
interface MetaTagConfig {
keyAttribute?: string;
contentAsAttribute?: boolean | string;
attributes: boolean | Array<string>;
}
declare type MetaTagName = 'title' | 'base' | 'meta' | 'link' | 'style' | 'script' | 'noscript';
declare type MetaTagsConfig = {
[key in MetaTagName]: MetaTagConfig;
};
declare type TODO = any;
/**
* Proxied meta source for tracking changes and updating the active meta daa
*/
interface MetaSourceProxy extends MergedObject {
}
/**
* Metainfo data source input by the user through the useMeta fn
*/
declare type MetaSource = {
[key: string]: TODO;
};
/**
* Return value of the useMeta api
*/
declare type MetaProxy = {
meta: MetaSourceProxy;
unmount: Function | false;
};
/**
* The active/aggregated meta data currently rendered
*/
interface MetaActive {
[key: string]: TODO;
}
/**
* Context passed to the meta resolvers
*/
declare type MetaResolveContext = ResolveContext & {
vm: ComponentInternalInstance | undefined;
};
declare type MetaResolveSetup = (context: MetaResolveContext) => void;
declare type MetaResolver = {
setup?: MetaResolveSetup;
resolve: ResolveMethod;
};
/**
* The meta manager
*/
declare type MetaManager = {
readonly config: MetaConfig;
install(app: App): void;
addMeta(source: MetaSource, vm?: ComponentInternalInstance): MetaProxy;
render(ctx?: {
slots?: Slots;
}): Array<VNode>;
};
/**
* @internal
*/
declare type MetaTeleports = {
[key: string]: Array<VNode>;
};
/**
* @internal
*/
interface MetaRenderContext {
slots?: Slots;
metainfo: MetaActive;
}
/**
* @internal
*/
interface MetaGroupConfig {
group: string;
data: Array<TODO> | TODO;
tagNamespace?: string;
fullName?: string;
slotName?: string;
}
/**
* @internal
*/
interface SlotScopeProperties {
content: string;
metainfo: MetaActive;
[key: string]: any;
}
/**
* @internal
*/
declare type MetaRenderedNode = {
vnode: VNode;
to?: string;
};
/**
* @internal
*/
declare type MetaRendered = Array<MetaRenderedNode>;
declare module '@vue/runtime-core' {
interface ComponentInternalInstance {
$metaManager: MetaManager;
}
}
declare type MergeResolveContextDeepest = MetaResolveContext & {
depth: number;
};
declare function setup(context: MergeResolveContextDeepest): void;
declare const resolve: ResolveMethod;
declare const deepest_d_setup: typeof setup;
declare const deepest_d_resolve: typeof resolve;
declare namespace deepest_d {
export {
deepest_d_setup as setup,
deepest_d_resolve as resolve,
};
}
declare const defaultConfig: MetaConfig;
declare function createMetaManager(config: MetaConfig, resolver: MetaResolver | ResolveMethod): MetaManager;
declare type ResolveOptionReducer = (accumulator: any, context: ResolveContext) => ResolveMethod;
declare const resolveOption: (predicament: ResolveOptionReducer) => ResolveMethod;
declare function renderToStringWithMeta(app: App): Promise<[string, SSRContext]>;
declare function getCurrentManager(vm?: ComponentInternalInstance): MetaManager | undefined;
declare function useMeta(source: MetaSource, manager?: MetaManager): MetaProxy;
declare function useActiveMeta(): MetaActive;
export { MetaActive, MetaConfig, MetaConfigSection, MetaConfigSectionAttribute, MetaConfigSectionGroup, MetaConfigSectionKey, MetaConfigSectionTag, MetaGroupConfig, MetaManager, MetaProxy, MetaRenderContext, MetaRendered, MetaRenderedNode, MetaResolveContext, MetaResolveSetup, MetaResolver, MetaSource, MetaSourceProxy, MetaTagConfig, MetaTagConfigKey, MetaTagName, MetaTagsConfig, MetaTeleports, SlotScopeProperties, TODO, createMetaManager, deepest_d as deepestResolver, defaultConfig, getCurrentManager, renderToStringWithMeta, resolveOption, useActiveMeta, useMeta };
+118 -111
View File
@@ -87,29 +87,8 @@ const defaultConfig = {
}
};
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
const tags = {
title: {
@@ -162,24 +141,34 @@ const tags = {
}
};
function getConfigByKey(tagOrName, key, config) {
if (config && key in config) {
return config[key];
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key];
}
function getTagConfigItem(tagOrName, key) {
for (const name of tagOrName) {
const tag = tags[name];
if (name && tag) {
return tag[key];
}
return;
}
if (tagOrName in tags) {
const tag = tags[tagOrName];
return tag[key];
}
}
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
// https://github.com/microsoft/TypeScript/issues/1863
const IS_PROXY = Symbol('kIsProxy');
const PROXY_SOURCES = Symbol('kProxySources');
@@ -439,42 +428,37 @@ const createMergedObject = (resolve, active = {}) => {
sources
};
const compute = () => recompute(context);
const addSource = (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return proxy;
};
const delSource = (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return true;
return proxy;
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
if (recompute) {
compute();
}
return true;
}
return false;
}
return false;
};
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
};
};
const cachedElements = {};
function renderMeta(context, key, data, config) {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config);
}
if (config.group) {
if ('group' in config) {
return renderGroup(context, key, data, config);
}
return renderTag(context, key, data, config);
@@ -484,7 +468,7 @@ function renderGroup(context, key, data, config) {
if (isArray(data)) {
{
// eslint-disable-next-line no-console
console.warn('Specifying an array for group properties isnt supported mostly as we didnt found a use-case for this yet. If you have one, please create an issue on the vue-meta repo');
console.warn('Specifying an array for group properties isnt supported');
}
// config.attributes = getConfigKey([key, config.tag], 'attributes', config)
return [];
@@ -510,7 +494,7 @@ function renderGroup(context, key, data, config) {
function renderTag(context, key, data, config = {}, groupConfig) {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent'];
const getConfig = (key) => getConfigByKey([tag, config.tag], key, config);
const getTagConfig = (key) => getTagConfigItem([tag, config.tag], key);
if (isArray(data)) {
return data
.map((child) => {
@@ -519,7 +503,7 @@ function renderTag(context, key, data, config = {}, groupConfig) {
.flat();
}
const { tag = config.tag || key } = data;
let content;
let content = '';
let hasChilds = false;
let isRaw = false;
if (isString(data)) {
@@ -571,24 +555,24 @@ function renderTag(context, key, data, config = {}, groupConfig) {
content = getSlotContent(context, slotName, content, data);
}
else {
const contentAsAttribute = getConfig('contentAsAttribute');
let valueAttribute = config.valueAttribute;
const contentAsAttribute = !!getTagConfig('contentAsAttribute');
let { valueAttribute } = config;
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0];
const [tagAttribute] = getTagConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute;
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data);
}
else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute');
const { nameless, keyAttribute } = config;
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName;
}
}
attributes[valueAttribute] = getSlotContent(context, slotName, attributes[valueAttribute] || content, groupConfig);
content = undefined;
content = '';
}
}
const finalTag = groupConfig && groupConfig.tagNamespace
@@ -598,32 +582,32 @@ function renderTag(context, key, data, config = {}, groupConfig) {
// console.log(' ATTRIBUTES', attributes)
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode;
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content;
vnode = h(finalTag, attributes);
}
else {
vnode = h(finalTag, attributes, content);
}
// Ignore empty string content
const vnode = h(finalTag, attributes, content || undefined);
return {
to: data.to,
vnode
};
}
function renderAttributes(context, key, data, config = {}) {
function renderAttributes(context, key, data, config) {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config;
if (!attributesFor) {
return;
}
if (!cachedElements[attributesFor]) {
const [el, el2] = Array.from(document.querySelectorAll(attributesFor));
if ( !el) {
// eslint-disable-next-line no-console
console.error('Could not find element with selector', attributesFor, ', won\'t render attributes');
console.error('Could not find element for selector', attributesFor, ', won\'t render attributes');
return;
}
if ( el2) {
// eslint-disable-next-line no-console
console.warn('Found multiple elements with selector', attributesFor);
console.warn('Found multiple elements for selector', attributesFor);
}
cachedElements[attributesFor] = {
el,
@@ -633,7 +617,7 @@ function renderAttributes(context, key, data, config = {}) {
const { el, attrs } = cachedElements[attributesFor];
for (const attr in data) {
const content = getSlotContent(context, `${key}(${attr})`, data[attr], data);
el.setAttribute(attr, `${content || ''}`);
el.setAttribute(attr, content || '');
if (!attrs.includes(attr)) {
attrs.push(attr);
}
@@ -644,19 +628,22 @@ function renderAttributes(context, key, data, config = {}) {
}
}
function getSlotContent({ metainfo, slots }, slotName, content, groupConfig) {
if (!slots || !slots[slotName]) {
const slot = slots && slots[slotName];
if (!slot) {
return content;
}
const slotProps = {
const slotScopeProps = {
content,
metainfo
};
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data;
const { group, data } = groupConfig;
slotScopeProps[group] = data;
}
const slotContent = slots[slotName](slotProps);
const slotContent = slot(slotScopeProps);
if (slotContent && slotContent.length) {
return slotContent[0].children;
const { children } = slotContent[0];
return children ? children.toString() : '';
}
return content;
}
@@ -667,15 +654,18 @@ const PolySymbol = (name) =>
hasSymbol
? Symbol( '[vue-meta]: ' + name )
: ( '[vue-meta]: ' ) + name;
const metaInfoKey = PolySymbol( 'metainfo' );
const metaActiveKey = /*#__PURE__*/ PolySymbol( 'active_meta' );
function getCurrentManager(vm) {
if (!vm) {
vm = getCurrentInstance();
vm = getCurrentInstance() || undefined;
}
if (!vm) {
return undefined;
}
return vm.appContext.config.globalProperties.$metaManager;
}
function useMeta(obj, manager) {
function useMeta(source, manager) {
const vm = getCurrentInstance();
if (!manager && vm) {
manager = getCurrentManager(vm);
@@ -684,10 +674,10 @@ function useMeta(obj, manager) {
// oopsydoopsy
throw new Error('No manager or current instance');
}
return manager.addMeta(obj, vm || undefined);
return manager.addMeta(source, vm || undefined);
}
function useMetainfo() {
return inject(metaInfoKey);
function useActiveMeta() {
return inject(metaActiveKey);
}
const MetainfoImpl = defineComponent({
@@ -707,22 +697,24 @@ const Metainfo = MetainfoImpl;
const ssrAttribute = 'data-vm-ssr';
const active = reactive({});
function addVnode(teleports, to, _vnodes) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]);
function addVnode(teleports, to, vnodes) {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]);
{
// Comments shouldnt have any use on the client as they are not reactive anyway
vnodes.forEach((vnode, idx) => {
nodes.forEach((vnode, idx) => {
if (vnode.type === Comment) {
vnodes.splice(idx, 1);
nodes.splice(idx, 1);
}
});
// only add ssrAttribute's for real meta tags
}
if (!teleports[to]) {
teleports[to] = [];
}
teleports[to].push(...vnodes);
teleports[to].push(...nodes);
}
function createMetaManager(config, resolver) {
let cleanedUpSsr = false;
const resolve = (options, contexts, active, key, pathSegments) => {
if (isFunction(resolver)) {
return resolver(options, contexts, active, key, pathSegments);
@@ -730,16 +722,18 @@ function createMetaManager(config, resolver) {
return resolver.resolve(options, contexts, active, key, pathSegments);
};
const { addSource, delSource } = createMergedObject(resolve, active);
let cleanedUpSsr = false;
// TODO: validate resolver
const manager = {
config,
install(app) {
app.component('Metainfo', Metainfo);
app.config.globalProperties.$metaManager = manager;
app.provide(metaInfoKey, active);
app.provide(metaActiveKey, active);
},
addMeta(metaObj, vm) {
if (!vm) {
vm = getCurrentInstance() || undefined;
}
const resolveContext = { vm };
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext);
@@ -759,9 +753,9 @@ function createMetaManager(config, resolver) {
// cleanup ssr tags if not yet done
if ( !cleanedUpSsr) {
cleanedUpSsr = true;
// Listen for DOM loaded because tags in the body couldnt be loaded
// yet once the manager does it first render
// (preferable there should only be one render on hydration)
// Listen for DOM loaded because tags in the body couldnt
// have loaded yet once the manager does it first render
// (preferable there should only be one meta render on hydration)
window.addEventListener('DOMContentLoaded', () => {
const ssrTags = document.querySelectorAll(`[${ssrAttribute}]`);
if (ssrTags && ssrTags.length) {
@@ -772,21 +766,34 @@ function createMetaManager(config, resolver) {
const teleports = {};
for (const key in active) {
const config = this.config[key] || {};
const vnode = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!vnode) {
let renderedNodes = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!renderedNodes) {
continue;
}
const vnodes = isArray(vnode) ? vnode : [vnode];
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head');
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode);
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes];
}
let defaultTo = key !== 'base' && active[key].to;
if (!defaultTo && 'to' in config) {
defaultTo = config.to;
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key;
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode);
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag];
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }));
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName;
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue;
}
const slot = slots[slotName];
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }));
}
}
}
@@ -798,4 +805,4 @@ function createMetaManager(config, resolver) {
return manager;
}
export { createMetaManager, deepest as deepestResolver, defaultConfig, getCurrentManager, resolveOption, useMeta, useMetainfo };
export { createMetaManager, deepest as deepestResolver, defaultConfig, getCurrentManager, resolveOption, useActiveMeta, useMeta };
+1 -1
View File
File diff suppressed because one or more lines are too long
+116 -113
View File
@@ -87,29 +87,8 @@ const defaultConfig = {
}
};
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
const tags = {
title: {
@@ -162,24 +141,34 @@ const tags = {
}
};
function getConfigByKey(tagOrName, key, config) {
if (config && key in config) {
return config[key];
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key];
}
function getTagConfigItem(tagOrName, key) {
for (const name of tagOrName) {
const tag = tags[name];
if (name && tag) {
return tag[key];
}
return;
}
if (tagOrName in tags) {
const tag = tags[tagOrName];
return tag[key];
}
}
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
// https://github.com/microsoft/TypeScript/issues/1863
const IS_PROXY = Symbol('kIsProxy');
const PROXY_SOURCES = Symbol('kProxySources');
@@ -439,41 +428,36 @@ const createMergedObject = (resolve, active = {}) => {
sources
};
const compute = () => recompute(context);
const addSource = (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return proxy;
};
const delSource = (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return true;
return proxy;
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
if (recompute) {
compute();
}
return true;
}
return false;
}
return false;
};
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
};
};
function renderMeta(context, key, data, config) {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config);
}
if (config.group) {
if ('group' in config) {
return renderGroup(context, key, data, config);
}
return renderTag(context, key, data, config);
@@ -483,7 +467,7 @@ function renderGroup(context, key, data, config) {
if (isArray(data)) {
if ((process.env.NODE_ENV !== 'production')) {
// eslint-disable-next-line no-console
console.warn('Specifying an array for group properties isnt supported mostly as we didnt found a use-case for this yet. If you have one, please create an issue on the vue-meta repo');
console.warn('Specifying an array for group properties isnt supported');
}
// config.attributes = getConfigKey([key, config.tag], 'attributes', config)
return [];
@@ -509,7 +493,7 @@ function renderGroup(context, key, data, config) {
function renderTag(context, key, data, config = {}, groupConfig) {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent'];
const getConfig = (key) => getConfigByKey([tag, config.tag], key, config);
const getTagConfig = (key) => getTagConfigItem([tag, config.tag], key);
if (isArray(data)) {
return data
.map((child) => {
@@ -518,7 +502,7 @@ function renderTag(context, key, data, config = {}, groupConfig) {
.flat();
}
const { tag = config.tag || key } = data;
let content;
let content = '';
let hasChilds = false;
let isRaw = false;
if (isString(data)) {
@@ -570,24 +554,24 @@ function renderTag(context, key, data, config = {}, groupConfig) {
content = getSlotContent(context, slotName, content, data);
}
else {
const contentAsAttribute = getConfig('contentAsAttribute');
let valueAttribute = config.valueAttribute;
const contentAsAttribute = !!getTagConfig('contentAsAttribute');
let { valueAttribute } = config;
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0];
const [tagAttribute] = getTagConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute;
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data);
}
else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute');
const { nameless, keyAttribute } = config;
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName;
}
}
attributes[valueAttribute] = getSlotContent(context, slotName, attributes[valueAttribute] || content, groupConfig);
content = undefined;
content = '';
}
}
const finalTag = groupConfig && groupConfig.tagNamespace
@@ -597,22 +581,22 @@ function renderTag(context, key, data, config = {}, groupConfig) {
// console.log(' ATTRIBUTES', attributes)
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode;
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content;
vnode = h(finalTag, attributes);
}
else {
vnode = h(finalTag, attributes, content);
}
// Ignore empty string content
const vnode = h(finalTag, attributes, content || undefined);
return {
to: data.to,
vnode
};
}
function renderAttributes(context, key, data, config = {}) {
function renderAttributes(context, key, data, config) {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config;
if (!attributesFor) {
return;
}
{
// render attributes in a placeholder vnode so Vue
// will render the string for us
@@ -623,19 +607,22 @@ function renderAttributes(context, key, data, config = {}) {
}
}
function getSlotContent({ metainfo, slots }, slotName, content, groupConfig) {
if (!slots || !slots[slotName]) {
const slot = slots && slots[slotName];
if (!slot) {
return content;
}
const slotProps = {
const slotScopeProps = {
content,
metainfo
};
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data;
const { group, data } = groupConfig;
slotScopeProps[group] = data;
}
const slotContent = slots[slotName](slotProps);
const slotContent = slot(slotScopeProps);
if (slotContent && slotContent.length) {
return slotContent[0].children;
const { children } = slotContent[0];
return children ? children.toString() : '';
}
return content;
}
@@ -646,15 +633,18 @@ const PolySymbol = (name) =>
hasSymbol
? Symbol((process.env.NODE_ENV !== 'production') ? '[vue-meta]: ' + name : name)
: ((process.env.NODE_ENV !== 'production') ? '[vue-meta]: ' : '_vm_') + name;
const metaInfoKey = PolySymbol((process.env.NODE_ENV !== 'production') ? 'metainfo' : 'mi');
const metaActiveKey = /*#__PURE__*/ PolySymbol((process.env.NODE_ENV !== 'production') ? 'active_meta' : 'am');
function getCurrentManager(vm) {
if (!vm) {
vm = getCurrentInstance();
vm = getCurrentInstance() || undefined;
}
if (!vm) {
return undefined;
}
return vm.appContext.config.globalProperties.$metaManager;
}
function useMeta(obj, manager) {
function useMeta(source, manager) {
const vm = getCurrentInstance();
if (!manager && vm) {
manager = getCurrentManager(vm);
@@ -663,10 +653,10 @@ function useMeta(obj, manager) {
// oopsydoopsy
throw new Error('No manager or current instance');
}
return manager.addMeta(obj, vm || undefined);
return manager.addMeta(source, vm || undefined);
}
function useMetainfo() {
return inject(metaInfoKey);
function useActiveMeta() {
return inject(metaActiveKey);
}
const MetainfoImpl = defineComponent({
@@ -686,23 +676,20 @@ const Metainfo = MetainfoImpl;
const ssrAttribute = 'data-vm-ssr';
const active = reactive({});
function addVnode(teleports, to, _vnodes) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]);
{
// dont add ssrAttribute for attribute vnode placeholder
if (!to.endsWith('Attrs')) {
vnodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
function addVnode(teleports, to, vnodes) {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]);
if (!to.endsWith('Attrs')) {
nodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {};
}
vnode.props[ssrAttribute] = true;
});
}
if (!teleports[to]) {
teleports[to] = [];
}
teleports[to].push(...vnodes);
teleports[to].push(...nodes);
}
function createMetaManager(config, resolver) {
const resolve = (options, contexts, active, key, pathSegments) => {
@@ -718,9 +705,12 @@ function createMetaManager(config, resolver) {
install(app) {
app.component('Metainfo', Metainfo);
app.config.globalProperties.$metaManager = manager;
app.provide(metaInfoKey, active);
app.provide(metaActiveKey, active);
},
addMeta(metaObj, vm) {
if (!vm) {
vm = getCurrentInstance() || undefined;
}
const resolveContext = { vm };
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext);
@@ -740,21 +730,34 @@ function createMetaManager(config, resolver) {
const teleports = {};
for (const key in active) {
const config = this.config[key] || {};
const vnode = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!vnode) {
let renderedNodes = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!renderedNodes) {
continue;
}
const vnodes = isArray(vnode) ? vnode : [vnode];
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head');
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode);
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes];
}
let defaultTo = key !== 'base' && active[key].to;
if (!defaultTo && 'to' in config) {
defaultTo = config.to;
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key;
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode);
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag];
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }));
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName;
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue;
}
const slot = slots[slotName];
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }));
}
}
}
@@ -766,7 +769,7 @@ function createMetaManager(config, resolver) {
return manager;
}
// rollup doesnt like an import, cant find export so use require
// rollup doesnt like an import as it cant find the export so use require
const { renderToString } = require('@vue/server-renderer');
async function renderToStringWithMeta(app) {
const ctx = {};
@@ -787,4 +790,4 @@ async function renderToStringWithMeta(app) {
return [html, ctx];
}
export { createMetaManager, deepest as deepestResolver, defaultConfig, getCurrentManager, renderToStringWithMeta, resolveOption, useMeta, useMetainfo };
export { createMetaManager, deepest as deepestResolver, defaultConfig, getCurrentManager, renderToStringWithMeta, resolveOption, useActiveMeta, useMeta };
+118 -111
View File
@@ -88,29 +88,8 @@ var VueMeta = (function (exports, vue) {
}
};
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
const tags = {
title: {
@@ -163,24 +142,34 @@ var VueMeta = (function (exports, vue) {
}
};
function getConfigByKey(tagOrName, key, config) {
if (config && key in config) {
return config[key];
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key];
}
function getTagConfigItem(tagOrName, key) {
for (const name of tagOrName) {
const tag = tags[name];
if (name && tag) {
return tag[key];
}
return;
}
if (tagOrName in tags) {
const tag = tags[tagOrName];
return tag[key];
}
}
/**
* Make a map and return a function for checking if a key
* is in that map.
* IMPORTANT: all calls of this function must be prefixed with
* \/\*#\_\_PURE\_\_\*\/
* So that rollup can tree-shake them if necessary.
*/
(process.env.NODE_ENV !== 'production')
? Object.freeze({})
: {};
(process.env.NODE_ENV !== 'production') ? Object.freeze([]) : [];
const isArray = Array.isArray;
const isFunction = (val) => typeof val === 'function';
const isString = (val) => typeof val === 'string';
const isObject = (val) => val !== null && typeof val === 'object';
const objectToString = Object.prototype.toString;
const toTypeString = (value) => objectToString.call(value);
const isPlainObject = (val) => toTypeString(val) === '[object Object]';
// https://github.com/microsoft/TypeScript/issues/1863
const IS_PROXY = Symbol('kIsProxy');
const PROXY_SOURCES = Symbol('kProxySources');
@@ -440,42 +429,37 @@ var VueMeta = (function (exports, vue) {
sources
};
const compute = () => recompute(context);
const addSource = (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return proxy;
};
const delSource = (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {});
if (recompute) {
compute();
}
return true;
return proxy;
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy);
if (index > -1) {
sources.splice(index, 1);
if (recompute) {
compute();
}
return true;
}
return false;
}
return false;
};
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
};
};
const cachedElements = {};
function renderMeta(context, key, data, config) {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config);
}
if (config.group) {
if ('group' in config) {
return renderGroup(context, key, data, config);
}
return renderTag(context, key, data, config);
@@ -485,7 +469,7 @@ var VueMeta = (function (exports, vue) {
if (isArray(data)) {
{
// eslint-disable-next-line no-console
console.warn('Specifying an array for group properties isnt supported mostly as we didnt found a use-case for this yet. If you have one, please create an issue on the vue-meta repo');
console.warn('Specifying an array for group properties isnt supported');
}
// config.attributes = getConfigKey([key, config.tag], 'attributes', config)
return [];
@@ -511,7 +495,7 @@ var VueMeta = (function (exports, vue) {
function renderTag(context, key, data, config = {}, groupConfig) {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent'];
const getConfig = (key) => getConfigByKey([tag, config.tag], key, config);
const getTagConfig = (key) => getTagConfigItem([tag, config.tag], key);
if (isArray(data)) {
return data
.map((child) => {
@@ -520,7 +504,7 @@ var VueMeta = (function (exports, vue) {
.flat();
}
const { tag = config.tag || key } = data;
let content;
let content = '';
let hasChilds = false;
let isRaw = false;
if (isString(data)) {
@@ -572,24 +556,24 @@ var VueMeta = (function (exports, vue) {
content = getSlotContent(context, slotName, content, data);
}
else {
const contentAsAttribute = getConfig('contentAsAttribute');
let valueAttribute = config.valueAttribute;
const contentAsAttribute = !!getTagConfig('contentAsAttribute');
let { valueAttribute } = config;
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0];
const [tagAttribute] = getTagConfig('attributes');
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute;
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data);
}
else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute');
const { nameless, keyAttribute } = config;
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName;
}
}
attributes[valueAttribute] = getSlotContent(context, slotName, attributes[valueAttribute] || content, groupConfig);
content = undefined;
content = '';
}
}
const finalTag = groupConfig && groupConfig.tagNamespace
@@ -599,32 +583,32 @@ var VueMeta = (function (exports, vue) {
// console.log(' ATTRIBUTES', attributes)
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode;
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content;
vnode = vue.h(finalTag, attributes);
}
else {
vnode = vue.h(finalTag, attributes, content);
}
// Ignore empty string content
const vnode = vue.h(finalTag, attributes, content || undefined);
return {
to: data.to,
vnode
};
}
function renderAttributes(context, key, data, config = {}) {
function renderAttributes(context, key, data, config) {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config;
if (!attributesFor) {
return;
}
if (!cachedElements[attributesFor]) {
const [el, el2] = Array.from(document.querySelectorAll(attributesFor));
if ( !el) {
// eslint-disable-next-line no-console
console.error('Could not find element with selector', attributesFor, ', won\'t render attributes');
console.error('Could not find element for selector', attributesFor, ', won\'t render attributes');
return;
}
if ( el2) {
// eslint-disable-next-line no-console
console.warn('Found multiple elements with selector', attributesFor);
console.warn('Found multiple elements for selector', attributesFor);
}
cachedElements[attributesFor] = {
el,
@@ -634,7 +618,7 @@ var VueMeta = (function (exports, vue) {
const { el, attrs } = cachedElements[attributesFor];
for (const attr in data) {
const content = getSlotContent(context, `${key}(${attr})`, data[attr], data);
el.setAttribute(attr, `${content || ''}`);
el.setAttribute(attr, content || '');
if (!attrs.includes(attr)) {
attrs.push(attr);
}
@@ -645,19 +629,22 @@ var VueMeta = (function (exports, vue) {
}
}
function getSlotContent({ metainfo, slots }, slotName, content, groupConfig) {
if (!slots || !slots[slotName]) {
const slot = slots && slots[slotName];
if (!slot) {
return content;
}
const slotProps = {
const slotScopeProps = {
content,
metainfo
};
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data;
const { group, data } = groupConfig;
slotScopeProps[group] = data;
}
const slotContent = slots[slotName](slotProps);
const slotContent = slot(slotScopeProps);
if (slotContent && slotContent.length) {
return slotContent[0].children;
const { children } = slotContent[0];
return children ? children.toString() : '';
}
return content;
}
@@ -668,15 +655,18 @@ var VueMeta = (function (exports, vue) {
hasSymbol
? Symbol( '[vue-meta]: ' + name )
: ( '[vue-meta]: ' ) + name;
const metaInfoKey = PolySymbol( 'metainfo' );
const metaActiveKey = /*#__PURE__*/ PolySymbol( 'active_meta' );
function getCurrentManager(vm) {
if (!vm) {
vm = vue.getCurrentInstance();
vm = vue.getCurrentInstance() || undefined;
}
if (!vm) {
return undefined;
}
return vm.appContext.config.globalProperties.$metaManager;
}
function useMeta(obj, manager) {
function useMeta(source, manager) {
const vm = vue.getCurrentInstance();
if (!manager && vm) {
manager = getCurrentManager(vm);
@@ -685,10 +675,10 @@ var VueMeta = (function (exports, vue) {
// oopsydoopsy
throw new Error('No manager or current instance');
}
return manager.addMeta(obj, vm || undefined);
return manager.addMeta(source, vm || undefined);
}
function useMetainfo() {
return vue.inject(metaInfoKey);
function useActiveMeta() {
return vue.inject(metaActiveKey);
}
const MetainfoImpl = vue.defineComponent({
@@ -708,22 +698,24 @@ var VueMeta = (function (exports, vue) {
const ssrAttribute = 'data-vm-ssr';
const active = vue.reactive({});
function addVnode(teleports, to, _vnodes) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]);
function addVnode(teleports, to, vnodes) {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]);
{
// Comments shouldnt have any use on the client as they are not reactive anyway
vnodes.forEach((vnode, idx) => {
nodes.forEach((vnode, idx) => {
if (vnode.type === vue.Comment) {
vnodes.splice(idx, 1);
nodes.splice(idx, 1);
}
});
// only add ssrAttribute's for real meta tags
}
if (!teleports[to]) {
teleports[to] = [];
}
teleports[to].push(...vnodes);
teleports[to].push(...nodes);
}
function createMetaManager(config, resolver) {
let cleanedUpSsr = false;
const resolve = (options, contexts, active, key, pathSegments) => {
if (isFunction(resolver)) {
return resolver(options, contexts, active, key, pathSegments);
@@ -731,16 +723,18 @@ var VueMeta = (function (exports, vue) {
return resolver.resolve(options, contexts, active, key, pathSegments);
};
const { addSource, delSource } = createMergedObject(resolve, active);
let cleanedUpSsr = false;
// TODO: validate resolver
const manager = {
config,
install(app) {
app.component('Metainfo', Metainfo);
app.config.globalProperties.$metaManager = manager;
app.provide(metaInfoKey, active);
app.provide(metaActiveKey, active);
},
addMeta(metaObj, vm) {
if (!vm) {
vm = vue.getCurrentInstance() || undefined;
}
const resolveContext = { vm };
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext);
@@ -760,9 +754,9 @@ var VueMeta = (function (exports, vue) {
// cleanup ssr tags if not yet done
if ( !cleanedUpSsr) {
cleanedUpSsr = true;
// Listen for DOM loaded because tags in the body couldnt be loaded
// yet once the manager does it first render
// (preferable there should only be one render on hydration)
// Listen for DOM loaded because tags in the body couldnt
// have loaded yet once the manager does it first render
// (preferable there should only be one meta render on hydration)
window.addEventListener('DOMContentLoaded', () => {
const ssrTags = document.querySelectorAll(`[${ssrAttribute}]`);
if (ssrTags && ssrTags.length) {
@@ -773,21 +767,34 @@ var VueMeta = (function (exports, vue) {
const teleports = {};
for (const key in active) {
const config = this.config[key] || {};
const vnode = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!vnode) {
let renderedNodes = renderMeta({ metainfo: active, slots }, key, active[key], config);
if (!renderedNodes) {
continue;
}
const vnodes = isArray(vnode) ? vnode : [vnode];
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head');
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode);
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes];
}
let defaultTo = key !== 'base' && active[key].to;
if (!defaultTo && 'to' in config) {
defaultTo = config.to;
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key;
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode);
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag];
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }));
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName;
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue;
}
const slot = slots[slotName];
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }));
}
}
}
@@ -804,8 +811,8 @@ var VueMeta = (function (exports, vue) {
exports.defaultConfig = defaultConfig;
exports.getCurrentManager = getCurrentManager;
exports.resolveOption = resolveOption;
exports.useActiveMeta = useActiveMeta;
exports.useMeta = useMeta;
exports.useMetainfo = useMetainfo;
Object.defineProperty(exports, '__esModule', { value: true });
+1 -1
View File
File diff suppressed because one or more lines are too long
+28 -5
View File
@@ -1,5 +1,5 @@
import { watch } from 'vue'
import { useMeta, useMetainfo } from 'vue-meta'
import { useMeta, useActiveMeta } from 'vue-meta'
export default {
setup () {
@@ -89,7 +89,7 @@ export default {
setTimeout(() => (meta.title = 'My Updated Title'), 2000)
setTimeout(() => (meta.htmlAttrs.amp = undefined), 2000)
const metadata = useMetainfo()
const metadata = useActiveMeta()
if (!process.server) {
window.$metadata = metadata
@@ -122,8 +122,7 @@ export default {
{{ content }} - {{ og.description }} - {{ metainfo.description }} - Hello Again
</template>
<!-- // TODO: Using script triggers [Vue warn]: Template compilation error: Tags with side effect (<script> and <style>) are i
gnored in client component templates. -->
<!-- // TODO: Using script triggers [Vue warn]: Template compilation error: Tags with side effect (<script> and <style>) are ignored in client component templates. -->
<component is="script">window.users = []</component>
<component is="script" src="user-1.js"></component>
<component is="script" src="user-2.js"></component>
@@ -149,7 +148,31 @@ gnored in client component templates. -->
},
template: `
<metainfo>
<template v-slot:body><span/></template>
<template v-slot:base="{ content, metainfo }">http://nuxt.dev:3000{{ content }}</template>
<template v-slot:title="{ content, metainfo }">{{ content }} - {{ metainfo.description }} - Hello</template>
<template v-slot:og(title)="{ content, metainfo, og }">
{{ content }} - {{ og.description }} - {{ metainfo.description }} - Hello Again
</template>
<!-- // TODO: Using script triggers [Vue warn]: Template compilation error: Tags with side effect (<script> and <style>) are ignored in client component templates. -->
<component is="script">window.users = []</component>
<component is="script" src="user-1.js"></component>
<component is="script" src="user-2.js"></component>
<template v-slot:head="{ metainfo }">
<!--[if IE]>
// -> Reactivity is not supported by Vue in comments, all comments are ignored
<component is="script" :src="metainfo.script[0].src" ></component>
// -> but a static file should work
<script src="user-3.js" ></script>
// -> altho Vue probably strips comments in production builds (but can be configged afaik)
<![endif]-->
<component is="script" :src="metainfo.script[0].src" ></component>
</template>
<template v-slot:body>
<component is="script" src="user-4.js"></component>
</template>
</metainfo>
<div id="app">
+5 -7
View File
@@ -1,10 +1,6 @@
import { defineComponent, VNodeProps } from 'vue'
import { defineComponent } from 'vue'
import type { VNodeProps, AllowedComponentProps, ComponentCustomProps } from 'vue'
import { getCurrentManager } from './useApi'
import { MetainfoActive } from './types'
export interface MetainfoProps {
metainfo: MetainfoActive
}
export const MetainfoImpl = defineComponent({
name: 'Metainfo',
@@ -23,6 +19,8 @@ export const MetainfoImpl = defineComponent({
export const Metainfo = (MetainfoImpl as any) as {
new (): {
$props: VNodeProps & MetainfoProps
$props: AllowedComponentProps &
ComponentCustomProps &
VNodeProps
}
}
+2 -2
View File
@@ -1,6 +1,6 @@
import { Config } from '../types'
import { MetaConfig } from '../types'
export const defaultConfig: Config = {
export const defaultConfig: MetaConfig = {
body: {
tag: 'script',
to: 'body'
+8 -26
View File
@@ -1,32 +1,14 @@
import { isArray } from '@vue/shared'
import { Config } from '../types'
import type { MetaTagConfigKey, MetaTagName } from '../types'
import { tags } from './tags'
export function hasConfig (name: string, config: Config): boolean {
return !!config[name] || !!tags[name]
}
export function getConfigByKey (
tagOrName: string | Array<string>,
key: string,
config: Config
export function getTagConfigItem (
tagOrName: Array<MetaTagName>,
key: MetaTagConfigKey
): any {
if (config && key in config) {
return config[key]
}
if (isArray(tagOrName)) {
for (const name of tagOrName) {
if (name && name in tags) {
return tags[name][key]
}
for (const name of tagOrName) {
const tag = tags[name]
if (name && tag) {
return tag[key]
}
return
}
if (tagOrName in tags) {
const tag = tags[tagOrName]
return tag[key]
}
}
+3 -13
View File
@@ -1,17 +1,9 @@
import type { MetaTagsConfig } from '../types'
/*
* This is a fixed config for real HTML tags
*
* TODO: we probably dont need all attributes
*/
export interface TagConfig {
keyAttribute?: string
contentAsAttribute?: boolean | string
attributes: boolean | Array<string>
[key: string]: any
}
const tags: { [key: string]: TagConfig } = {
export const tags: MetaTagsConfig = {
title: {
attributes: false
},
@@ -61,5 +53,3 @@ const tags: { [key: string]: TagConfig } = {
attributes: false
}
}
export { tags }
+68 -41
View File
@@ -1,46 +1,54 @@
import { h, reactive, onUnmounted, Teleport, VNode, Comment } from 'vue'
import { h, reactive, onUnmounted, Teleport, Comment, getCurrentInstance } from 'vue'
import type { VNode } from 'vue'
import { isArray, isFunction } from '@vue/shared'
import { createMergedObject } from './object-merge'
import { renderMeta } from './render'
import { metaInfoKey } from './symbols'
import { metaActiveKey } from './symbols'
import { Metainfo } from './Metainfo'
import type { ResolveMethod } from './object-merge'
import type { Manager, Config, Resolver, MetaContext, MetainfoActive } from './types'
import type {
MetaActive,
MetaConfig,
MetaManager,
MetaResolver,
MetaResolveContext,
MetaTeleports
} from './types'
export const ssrAttribute = 'data-vm-ssr'
export const active: MetainfoActive = reactive({})
export const active: MetaActive = reactive({})
export function addVnode (teleports: any, to: string, _vnodes: VNode | Array<VNode>) {
const vnodes = (isArray(_vnodes) ? _vnodes : [_vnodes]) as Array<VNode>
export function addVnode (teleports: MetaTeleports, to: string, vnodes: VNode | Array<VNode>): void {
const nodes = (isArray(vnodes) ? vnodes : [vnodes]) as Array<VNode>
if (!__BROWSER__) {
// dont add ssrAttribute for attribute vnode placeholder
if (!to.endsWith('Attrs')) {
vnodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {}
}
vnode.props[ssrAttribute] = true
})
}
} else {
if (__BROWSER__) {
// Comments shouldnt have any use on the client as they are not reactive anyway
vnodes.forEach((vnode, idx) => {
nodes.forEach((vnode, idx) => {
if (vnode.type === Comment) {
vnodes.splice(idx, 1)
nodes.splice(idx, 1)
}
})
// only add ssrAttribute's for real meta tags
} else if (!to.endsWith('Attrs')) {
nodes.forEach((vnode) => {
if (!vnode.props) {
vnode.props = {}
}
vnode.props[ssrAttribute] = true
})
}
if (!teleports[to]) {
teleports[to] = []
}
teleports[to].push(...vnodes)
teleports[to].push(...nodes)
}
export function createMetaManager (config: Config, resolver: Resolver | ResolveMethod): Manager {
export function createMetaManager (config: MetaConfig, resolver: MetaResolver | ResolveMethod): MetaManager {
let cleanedUpSsr = false
const resolve: ResolveMethod = (options, contexts, active, key, pathSegments) => {
if (isFunction(resolver)) {
return resolver(options, contexts, active, key, pathSegments)
@@ -51,21 +59,23 @@ export function createMetaManager (config: Config, resolver: Resolver | ResolveM
const { addSource, delSource } = createMergedObject(resolve, active)
let cleanedUpSsr = false
// TODO: validate resolver
const manager: Manager = {
const manager: MetaManager = {
config,
install (app) {
app.component('Metainfo', Metainfo)
app.config.globalProperties.$metaManager = manager
app.provide(metaInfoKey, active)
app.provide(metaActiveKey, active)
},
addMeta (metaObj, vm) {
const resolveContext: MetaContext = { vm }
if (!vm) {
vm = getCurrentInstance() || undefined
}
const resolveContext: MetaResolveContext = { vm }
if (resolver && 'setup' in resolver && isFunction(resolver.setup)) {
resolver.setup(resolveContext)
}
@@ -84,14 +94,14 @@ export function createMetaManager (config: Config, resolver: Resolver | ResolveM
}
},
render ({ slots }: any = {}): Array<VNode> {
render ({ slots } = {}) {
// cleanup ssr tags if not yet done
if (__BROWSER__ && !cleanedUpSsr) {
cleanedUpSsr = true
// Listen for DOM loaded because tags in the body couldnt be loaded
// yet once the manager does it first render
// (preferable there should only be one render on hydration)
// Listen for DOM loaded because tags in the body couldnt
// have loaded yet once the manager does it first render
// (preferable there should only be one meta render on hydration)
window.addEventListener('DOMContentLoaded', () => {
const ssrTags = document.querySelectorAll(`[${ssrAttribute}]`)
@@ -101,36 +111,53 @@ export function createMetaManager (config: Config, resolver: Resolver | ResolveM
})
}
const teleports: { [key: string]: VNode | Array<VNode> } = {}
const teleports: MetaTeleports = {}
for (const key in active) {
const config = this.config[key] || {}
const vnode = renderMeta(
let renderedNodes = renderMeta(
{ metainfo: active, slots },
key,
active[key],
config
)
if (!vnode) {
if (!renderedNodes) {
continue
}
const vnodes = isArray(vnode) ? vnode : [vnode]
if (!isArray(renderedNodes)) {
renderedNodes = [renderedNodes]
}
const defaultTo = (key !== 'base' && active[key].to) || config.to || (config.attributesFor ? key : 'head')
let defaultTo = key !== 'base' && active[key].to
for (const { to, vnode } of vnodes) {
addVnode(teleports, to || defaultTo, vnode)
if (!defaultTo && 'to' in config) {
defaultTo = config.to
}
if (!defaultTo && 'attributesFor' in config) {
defaultTo = key
}
for (const { to, vnode } of renderedNodes) {
addVnode(teleports, to || defaultTo || 'head', vnode)
}
}
if (slots) {
for (const tag in slots) {
const slotFn = slots[tag]
if (isFunction(slotFn)) {
addVnode(teleports, tag === 'default' ? 'head' : tag, slotFn({ metainfo: active }))
for (const slotName in slots) {
const tagName = slotName === 'default' ? 'head' : slotName
// Only teleport the contents of head/body slots
if (tagName !== 'head' && tagName !== 'body') {
continue
}
const slot = slots[slotName]
if (isFunction(slot)) {
addVnode(teleports, tagName, slot({ metainfo: active }))
}
}
}
+30 -30
View File
@@ -31,7 +31,14 @@ export type MergeContext = {
sources: Array<MergeSource>
}
export const createMergedObject = (resolve: ResolveMethod, active: MergedObject = {}) => {
export type MergedObjectBuilder = {
context: MergeContext
compute: () => void
addSource: (source: MergeSource, resolveContext: ResolveContext | undefined, recompute?: Boolean) => any
delSource: (sourceOrProxy: MergeSource, recompute?: boolean) => boolean
}
export const createMergedObject = (resolve: ResolveMethod, active: MergedObject = {}): MergedObjectBuilder => {
const sources: Array<MergeSource> = []
if (!active) {
@@ -44,41 +51,34 @@ export const createMergedObject = (resolve: ResolveMethod, active: MergedObject
sources
}
const compute = () => recompute(context)
const compute: () => void = () => recompute(context)
const addSource = (source: MergeSource, resolveContext: ResolveContext | undefined, recompute: Boolean = false) => {
const proxy = createProxy(context, source, resolveContext || {})
if (recompute) {
compute()
}
return proxy
}
const delSource = (sourceOrProxy: MergeSource, recompute: boolean = true): boolean => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy)
if (index > -1) {
sources.splice(index, 1)
return {
context,
compute,
addSource: (source, resolveContext, recompute = false) => {
const proxy = createProxy(context, source, resolveContext || {})
if (recompute) {
compute()
}
return true
return proxy
},
delSource: (sourceOrProxy, recompute = true) => {
const index = sources.findIndex(src => src === sourceOrProxy || src[PROXY_TARGET] === sourceOrProxy)
if (index > -1) {
sources.splice(index, 1)
if (recompute) {
compute()
}
return true
}
return false
}
return false
}
return {
context,
active,
resolve,
sources,
addSource,
delSource,
compute
}
}
+66 -76
View File
@@ -1,7 +1,19 @@
import { h, VNode } from 'vue'
import { h } from 'vue'
import { isArray, isString } from '@vue/shared'
import { getConfigByKey } from './config'
import { TODO } from './types'
import { getTagConfigItem } from './config'
import type {
MetaConfigSectionAttribute,
MetaConfigSectionGroup,
MetaConfigSectionTag,
MetaConfigSection,
MetaGroupConfig,
MetaRenderContext,
MetaRenderedNode,
MetaRendered,
MetaTagConfigKey,
SlotScopeProperties,
TODO
} from './types'
const cachedElements: {
[key: string]: {
@@ -10,63 +22,37 @@ const cachedElements: {
}
} = {}
export interface RenderContext {
slots: any
[key: string]: TODO
}
export interface GroupConfig {
group: string
data: Array<TODO> | TODO
tagNamespace?: string
fullName?: string
slotName?: string
}
export interface SlotScopeProperties {
content: any
metainfo: any
[key: string]: any
}
export type RenderedMetainfoNode = {
vnode: VNode
to?: string
}
export type RenderedMetainfo = Array<RenderedMetainfoNode>
export function renderMeta (
context: RenderContext,
context: MetaRenderContext,
key: string,
data: TODO,
config: TODO
): void | RenderedMetainfo | RenderedMetainfoNode {
config: MetaConfigSection
): void | MetaRendered | MetaRenderedNode {
// console.info('renderMeta', key, data, config)
if (config.attributesFor) {
return renderAttributes(context, key, data, config)
if ('attributesFor' in config) {
return renderAttributes(context, key, data, config as MetaConfigSectionAttribute)
}
if (config.group) {
return renderGroup(context, key, data, config)
if ('group' in config) {
return renderGroup(context, key, data, config as MetaConfigSectionGroup)
}
return renderTag(context, key, data, config)
}
export function renderGroup (
context: RenderContext,
context: MetaRenderContext,
key: string,
data: TODO,
config: TODO
): RenderedMetainfo | RenderedMetainfoNode {
config: MetaConfigSectionGroup
): MetaRendered | MetaRenderedNode {
// console.info('renderGroup', key, data, config)
if (isArray(data)) {
if (__DEV__) {
// eslint-disable-next-line no-console
console.warn('Specifying an array for group properties isnt supported mostly as we didnt found a use-case for this yet. If you have one, please create an issue on the vue-meta repo')
console.warn('Specifying an array for group properties isnt supported')
}
// config.attributes = getConfigKey([key, config.tag], 'attributes', config)
return []
@@ -74,7 +60,7 @@ export function renderGroup (
return Object.keys(data)
.map((childKey) => {
const groupConfig: GroupConfig = {
const groupConfig: MetaGroupConfig = {
group: key,
data
}
@@ -89,22 +75,22 @@ export function renderGroup (
groupConfig.slotName = `${namespace}(${childKey})`
}
return renderTag(context, key, data[childKey], config, groupConfig)
return renderTag(context, key, data[childKey], config as MetaConfigSectionTag, groupConfig)
})
.flat()
}
export function renderTag (
context: RenderContext,
context: MetaRenderContext,
key: string,
data: TODO,
config: TODO = {},
groupConfig?: GroupConfig
): RenderedMetainfo | RenderedMetainfoNode {
config: MetaConfigSectionTag = {},
groupConfig?: MetaGroupConfig
): MetaRendered | MetaRenderedNode {
// console.info('renderTag', key, data, config, groupConfig)
const contentAttributes = ['content', 'json', 'rawContent']
const getConfig = (key: string) => getConfigByKey([tag, config.tag], key, config)
const getTagConfig = (key: MetaTagConfigKey) => getTagConfigItem([tag, config.tag], key)
if (isArray(data)) {
return data
@@ -116,7 +102,7 @@ export function renderTag (
const { tag = config.tag || key } = data
let content
let content: string = ''
let hasChilds: boolean = false
let isRaw: boolean = false
@@ -174,19 +160,19 @@ export function renderTag (
if (hasChilds) {
content = getSlotContent(context, slotName, content, data)
} else {
const contentAsAttribute = getConfig('contentAsAttribute')
let valueAttribute = config.valueAttribute
const contentAsAttribute = !!getTagConfig('contentAsAttribute')
let { valueAttribute } = config
if (!valueAttribute && contentAsAttribute) {
const tagAttributes = getConfig('attributes')
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttributes[0]
const [tagAttribute] = getTagConfig('attributes')
valueAttribute = isString(contentAsAttribute) ? contentAsAttribute : tagAttribute
}
if (!valueAttribute) {
content = getSlotContent(context, slotName, content, data)
} else {
if (!config.nameless) {
const keyAttribute = getConfig('keyAttribute')
const { nameless, keyAttribute } = config
if (!nameless) {
if (keyAttribute) {
attributes[keyAttribute] = fullName
}
@@ -199,7 +185,7 @@ export function renderTag (
groupConfig
)
content = undefined
content = ''
}
}
@@ -213,15 +199,13 @@ export function renderTag (
// console.log(' CONTENT', content)
// // console.log(data, attributes, config)
let vnode
if (isRaw) {
if (isRaw && content) {
attributes.innerHTML = content
vnode = h(finalTag, attributes)
} else {
vnode = h(finalTag, attributes, content)
}
// Ignore empty string content
const vnode = h(finalTag, attributes, content || undefined)
return {
to: data.to,
vnode
@@ -229,14 +213,17 @@ export function renderTag (
}
export function renderAttributes (
context: RenderContext,
context: MetaRenderContext,
key: string,
data: TODO,
config: TODO = {}
): RenderedMetainfoNode | void {
config: MetaConfigSectionAttribute
): MetaRenderedNode | void {
// console.info('renderAttributes', key, data, config)
const { attributesFor } = config
if (!attributesFor) {
return
}
if (!__BROWSER__) {
// render attributes in a placeholder vnode so Vue
@@ -252,13 +239,13 @@ export function renderAttributes (
if (__DEV__ && !el) {
// eslint-disable-next-line no-console
console.error('Could not find element with selector', attributesFor, ', won\'t render attributes')
console.error('Could not find element for selector', attributesFor, ', won\'t render attributes')
return
}
if (__DEV__ && el2) {
// eslint-disable-next-line no-console
console.warn('Found multiple elements with selector', attributesFor)
console.warn('Found multiple elements for selector', attributesFor)
}
cachedElements[attributesFor] = {
@@ -272,7 +259,7 @@ export function renderAttributes (
for (const attr in data) {
const content = getSlotContent(context, `${key}(${attr})`, data[attr], data)
el.setAttribute(attr, `${content || ''}`)
el.setAttribute(attr, content || '')
if (!attrs.includes(attr)) {
attrs.push(attr)
@@ -286,28 +273,31 @@ export function renderAttributes (
}
export function getSlotContent (
{ metainfo, slots }: RenderContext,
{ metainfo, slots }: MetaRenderContext,
slotName: string,
content: any,
groupConfig?: GroupConfig
): TODO {
if (!slots || !slots[slotName]) {
content: string,
groupConfig?: MetaGroupConfig
): string {
const slot = slots && slots[slotName]
if (!slot) {
return content
}
const slotProps: SlotScopeProperties = {
const slotScopeProps: SlotScopeProperties = {
content,
metainfo
}
if (groupConfig && groupConfig.group) {
slotProps[groupConfig.group] = groupConfig.data
const { group, data } = groupConfig
slotScopeProps[group] = data
}
const slotContent = slots[slotName](slotProps)
const slotContent = slot(slotScopeProps)
if (slotContent && slotContent.length) {
return slotContent[0].children
const { children } = slotContent[0]
return children ? children.toString() : ''
}
return content
+4 -4
View File
@@ -1,12 +1,12 @@
import { ResolveContext, ResolveMethod } from '../object-merge'
import { MetaContext } from '../types'
import { MetaResolveContext } from '../types'
import { resolveOption } from '.'
type MergeContextDeepest = MetaContext & {
type MergeResolveContextDeepest = MetaResolveContext & {
depth: number
}
export function setup (context: MergeContextDeepest): void {
export function setup (context: MergeResolveContextDeepest): void {
let depth: number = 0
if (context.vm) {
@@ -25,7 +25,7 @@ export function setup (context: MergeContextDeepest): void {
}
export const resolve: ResolveMethod = resolveOption((acc: any, context: ResolveContext) => {
const { depth } = (context as unknown as MergeContextDeepest)
const { depth } = (context as unknown as MergeResolveContextDeepest)
if (!acc || depth > acc) {
return acc
}
+1 -1
View File
@@ -1,7 +1,7 @@
import type { App } from 'vue'
import type { SSRContext } from '@vue/server-renderer'
// rollup doesnt like an import, cant find export so use require
// rollup doesnt like an import as it cant find the export so use require
const { renderToString } = require('@vue/server-renderer')
export async function renderToStringWithMeta (app: App): Promise<[string, SSRContext]> {
+5 -6
View File
@@ -1,8 +1,7 @@
import { InjectionKey } from 'vue'
import { MetainfoActive } from './types'
import { MetaActive } from './types'
export const hasSymbol =
typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol'
export const hasSymbol = typeof Symbol === 'function' && typeof Symbol.toStringTag === 'symbol'
export const PolySymbol = (name: string) =>
// vm = vue meta
@@ -10,6 +9,6 @@ export const PolySymbol = (name: string) =>
? Symbol(__DEV__ ? '[vue-meta]: ' + name : name)
: (__DEV__ ? '[vue-meta]: ' : '_vm_') + name
export const metaInfoKey = PolySymbol(
__DEV__ ? 'metainfo' : 'mi'
) as InjectionKey<MetainfoActive>
export const metaActiveKey = /*#__PURE__*/ PolySymbol(
__DEV__ ? 'active_meta' : 'am'
) as InjectionKey<MetaActive>
+40
View File
@@ -0,0 +1,40 @@
export type MetaConfigSectionKey = 'tag' | 'to' | 'keyAttribute' | 'valueAttribute' | 'nameless' | 'group' | 'namespaced' | 'namespacedAttribute' | 'attributesFor'
export interface MetaConfigSectionTag {
tag?: string
to?: string
keyAttribute?: string
valueAttribute?: string
nameless?: boolean
}
export type MetaConfigSectionGroup = {
group: boolean
namespaced?: boolean
namespacedAttribute?: boolean
}
export type MetaConfigSectionAttribute = {
attributesFor: string
}
export type MetaConfigSection = MetaConfigSectionGroup | MetaConfigSectionTag | MetaConfigSectionAttribute
export interface MetaConfig {
[key: string]: MetaConfigSection
}
export type MetaTagConfigKey = 'keyAttribute' | 'contentAsAttribute' | 'attributes'
export interface MetaTagConfig {
keyAttribute?: string
contentAsAttribute?: boolean | string
attributes: boolean | Array<string>
}
export type MetaTagName = 'title' | 'base' | 'meta' | 'link' | 'style' | 'script' | 'noscript'
export type MetaTagsConfig = {
[key in MetaTagName]: MetaTagConfig
}
+91 -49
View File
@@ -1,72 +1,114 @@
import type { App, VNode, ComponentInternalInstance } from 'vue'
import type { App, VNode, Slots, ComponentInternalInstance } from 'vue'
import type { MergedObject, ResolveContext, ResolveMethod } from '../object-merge'
import type { MetaConfig } from './config'
export * from './config'
export type TODO = any
export type MetainfoInput = {
/**
* Proxied meta source for tracking changes and updating the active meta daa
*/
export interface MetaSourceProxy extends MergedObject {}
/**
* Metainfo data source input by the user through the useMeta fn
*/
export type MetaSource = {
[key: string]: TODO
}
export type MetaContext = ResolveContext & {
/**
* Return value of the useMeta api
*/
export type MetaProxy = {
meta: MetaSourceProxy
unmount: Function | false
}
/**
* The active/aggregated meta data currently rendered
*/
export interface MetaActive {
[key: string]: TODO
}
/**
* Context passed to the meta resolvers
*/
export type MetaResolveContext = ResolveContext & {
vm: ComponentInternalInstance | undefined
}
export interface ConfigOption {
tag?: string
to?: string
group?: boolean
keyAttribute?: string
valueAttribute?: string
nameless?: boolean
namespaced?: boolean
namespacedAttribute?: boolean
attributesFor?: string
}
export type MetaResolveSetup = (context: MetaResolveContext) => void
export interface Config {
[key: string]: ConfigOption
}
export interface MetainfoProxy extends MergedObject {
}
export interface MetainfoActive {
[key: string]: TODO
}
export type MetaProxy = {
meta: MetainfoProxy
unmount: TODO
}
export type ResolveSetup = (context: MetaContext) => void
export type Resolver = {
setup?: ResolveSetup
export type MetaResolver = {
setup?: MetaResolveSetup
resolve: ResolveMethod
}
export type Manager = {
readonly config: Config
/**
* The meta manager
*/
export type MetaManager = {
readonly config: MetaConfig
install(app: App): void
addMeta(obj: MetainfoInput, vm?: ComponentInternalInstance): MetaProxy
addMeta(source: MetaSource, vm?: ComponentInternalInstance): MetaProxy
render(ctx: { slots?: any }): Array<VNode>
render(ctx?: { slots?: Slots }): Array<VNode>
}
/**
* @internal
*/
export type MetaTeleports = {
[key: string]: Array<VNode>
}
/**
* @internal
*/
export interface MetaRenderContext {
slots?: Slots
metainfo: MetaActive
}
/**
* @internal
*/
export interface MetaGroupConfig {
group: string
data: Array<TODO> | TODO
tagNamespace?: string
fullName?: string
slotName?: string
}
/**
* @internal
*/
export interface SlotScopeProperties {
content: string
metainfo: MetaActive
[key: string]: any
}
/**
* @internal
*/
export type MetaRenderedNode = {
vnode: VNode
to?: string
}
/**
* @internal
*/
export type MetaRendered = Array<MetaRenderedNode>
declare module '@vue/runtime-core' {
interface ComponentInternalInstance {
$metaManager: Manager
}
}
declare global {
namespace NodeJS {
interface Process {
client: boolean
server: boolean
}
$metaManager: MetaManager
}
}
+12 -8
View File
@@ -1,16 +1,20 @@
import { inject, getCurrentInstance, ComponentInternalInstance } from 'vue'
import { metaInfoKey } from './symbols'
import type { Manager, MetainfoActive, MetainfoInput, MetaProxy } from './types'
import { metaActiveKey } from './symbols'
import type { MetaManager, MetaActive, MetaSource, MetaProxy } from './types'
export function getCurrentManager (vm?: ComponentInternalInstance): Manager {
export function getCurrentManager (vm?: ComponentInternalInstance): MetaManager | undefined {
if (!vm) {
vm = getCurrentInstance()!
vm = getCurrentInstance() || undefined
}
if (!vm) {
return undefined
}
return vm.appContext.config.globalProperties.$metaManager
}
export function useMeta (obj: MetainfoInput, manager?: Manager): MetaProxy {
export function useMeta (source: MetaSource, manager?: MetaManager): MetaProxy {
const vm = getCurrentInstance()
if (!manager && vm) {
@@ -22,9 +26,9 @@ export function useMeta (obj: MetainfoInput, manager?: Manager): MetaProxy {
throw new Error('No manager or current instance')
}
return manager.addMeta(obj, vm || undefined)
return manager.addMeta(source, vm || undefined)
}
export function useMetainfo (): MetainfoActive {
return inject(metaInfoKey)!
export function useActiveMeta (): MetaActive {
return inject(metaActiveKey)!
}