@weaverse/hydrogen 1.0.54 → 1.0.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/index.d.mts +4 -8
  2. package/dist/index.d.ts +4 -8
  3. package/dist/index.js +9 -6
  4. package/dist/index.mjs +9 -6
  5. package/package.json +2 -2
package/dist/index.d.mts CHANGED
@@ -25,16 +25,13 @@ interface HydrogenComponentData extends Omit<ElementData, 'childIds' | 'css'> {
25
25
  createdAt: string;
26
26
  updatedAt: string;
27
27
  deletedAt: string;
28
- parentId: string;
29
28
  children: {
30
29
  id: string;
31
30
  }[];
32
31
  loaderData: unknown;
33
32
  data: Record<string, unknown>;
34
33
  }
35
- type ComponentFlags = Partial<Record<'isSection', boolean>>;
36
- interface HydrogenComponentSchema extends Omit<ElementSchema, 'parentTypes' | 'flags' | 'inspector'> {
37
- flags?: ComponentFlags;
34
+ interface HydrogenComponentSchema extends Omit<ElementSchema, 'parentTypes' | 'flags' | 'inspector' | 'gridSize' | 'childElements' | 'catalog'> {
38
35
  childTypes?: string[];
39
36
  inspector: InspectorGroup[];
40
37
  presets?: Omit<HydrogenComponentPresets, 'type'>;
@@ -75,7 +72,6 @@ interface HydrogenElement {
75
72
  }
76
73
  interface HydrogenComponentInstance extends Omit<WeaverseItemStore, '_flags' | 'data' | 'Element'> {
77
74
  get _element(): HTMLElement | null;
78
- get _flags(): ComponentFlags;
79
75
  get Element(): HydrogenElement | undefined;
80
76
  get data(): HydrogenComponentData;
81
77
  _store: HydrogenComponentData;
@@ -100,7 +96,7 @@ interface HydrogenPageData {
100
96
  }
101
97
  interface WeaverseHydrogenRootProps {
102
98
  weaverseData: HydrogenPageData;
103
- components: Record<string, HydrogenComponent>;
99
+ components: HydrogenComponent[];
104
100
  themeSchema: HydrogenThemeSchema;
105
101
  }
106
102
  type HydrogenThemeInfo = {
@@ -132,8 +128,8 @@ declare let fetchWithServerCache: ({ url, options, context, }: {
132
128
  context: AppLoadContext;
133
129
  }) => Promise<any>;
134
130
 
135
- declare function weaverseLoader(args: LoaderArgs, components: Record<string, HydrogenComponent>, loaderConfigs?: WeaverseLoaderConfigs): Promise<HydrogenPageData | null>;
131
+ declare function weaverseLoader(args: LoaderArgs, components: HydrogenComponent[], loaderConfigs?: WeaverseLoaderConfigs): Promise<HydrogenPageData | null>;
136
132
 
137
133
  declare function WeaverseHydrogenRoot(props: WeaverseHydrogenRootProps): React.JSX.Element;
138
134
 
139
- export { ComponentFlags, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, HydrogenThemeInfo, HydrogenThemeSchema, InspectorGroup, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, fetchWithServerCache, useThemeSettings, weaverseLoader };
135
+ export { HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, HydrogenThemeInfo, HydrogenThemeSchema, InspectorGroup, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, fetchWithServerCache, useThemeSettings, weaverseLoader };
package/dist/index.d.ts CHANGED
@@ -25,16 +25,13 @@ interface HydrogenComponentData extends Omit<ElementData, 'childIds' | 'css'> {
25
25
  createdAt: string;
26
26
  updatedAt: string;
27
27
  deletedAt: string;
28
- parentId: string;
29
28
  children: {
30
29
  id: string;
31
30
  }[];
32
31
  loaderData: unknown;
33
32
  data: Record<string, unknown>;
34
33
  }
35
- type ComponentFlags = Partial<Record<'isSection', boolean>>;
36
- interface HydrogenComponentSchema extends Omit<ElementSchema, 'parentTypes' | 'flags' | 'inspector'> {
37
- flags?: ComponentFlags;
34
+ interface HydrogenComponentSchema extends Omit<ElementSchema, 'parentTypes' | 'flags' | 'inspector' | 'gridSize' | 'childElements' | 'catalog'> {
38
35
  childTypes?: string[];
39
36
  inspector: InspectorGroup[];
40
37
  presets?: Omit<HydrogenComponentPresets, 'type'>;
@@ -75,7 +72,6 @@ interface HydrogenElement {
75
72
  }
76
73
  interface HydrogenComponentInstance extends Omit<WeaverseItemStore, '_flags' | 'data' | 'Element'> {
77
74
  get _element(): HTMLElement | null;
78
- get _flags(): ComponentFlags;
79
75
  get Element(): HydrogenElement | undefined;
80
76
  get data(): HydrogenComponentData;
81
77
  _store: HydrogenComponentData;
@@ -100,7 +96,7 @@ interface HydrogenPageData {
100
96
  }
101
97
  interface WeaverseHydrogenRootProps {
102
98
  weaverseData: HydrogenPageData;
103
- components: Record<string, HydrogenComponent>;
99
+ components: HydrogenComponent[];
104
100
  themeSchema: HydrogenThemeSchema;
105
101
  }
106
102
  type HydrogenThemeInfo = {
@@ -132,8 +128,8 @@ declare let fetchWithServerCache: ({ url, options, context, }: {
132
128
  context: AppLoadContext;
133
129
  }) => Promise<any>;
134
130
 
135
- declare function weaverseLoader(args: LoaderArgs, components: Record<string, HydrogenComponent>, loaderConfigs?: WeaverseLoaderConfigs): Promise<HydrogenPageData | null>;
131
+ declare function weaverseLoader(args: LoaderArgs, components: HydrogenComponent[], loaderConfigs?: WeaverseLoaderConfigs): Promise<HydrogenPageData | null>;
136
132
 
137
133
  declare function WeaverseHydrogenRoot(props: WeaverseHydrogenRootProps): React.JSX.Element;
138
134
 
139
- export { ComponentFlags, HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, HydrogenThemeInfo, HydrogenThemeSchema, InspectorGroup, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, fetchWithServerCache, useThemeSettings, weaverseLoader };
135
+ export { HydrogenComponent, HydrogenComponentData, HydrogenComponentInstance, HydrogenComponentPresets, HydrogenComponentProps, HydrogenComponentSchema, HydrogenElement, HydrogenPageConfigs, HydrogenPageData, HydrogenThemeInfo, HydrogenThemeSchema, InspectorGroup, PageType, TODO, WeaverseHydrogen, WeaverseHydrogenRoot, WeaverseHydrogenRootProps, WeaverseInternal, WeaverseLoaderArgs, WeaverseLoaderConfigs, fetchWithServerCache, useThemeSettings, weaverseLoader };
package/dist/index.js CHANGED
@@ -54,7 +54,9 @@ function createCachedWeaverseInstance(init) {
54
54
  return new import_react.Weaverse(init);
55
55
  }
56
56
  function createWeaverseInstance(weaverseData, components) {
57
- console.log("\u{1F4BF} Weaverse data", weaverseData);
57
+ if (import_react.isBrowser) {
58
+ console.log("\u{1F4BF} Weaverse data", weaverseData);
59
+ }
58
60
  let { page, configs = {}, project, pageAssignment } = weaverseData || {};
59
61
  let weaverse = createCachedWeaverseInstance({
60
62
  ...configs,
@@ -64,11 +66,11 @@ function createWeaverseInstance(weaverseData, components) {
64
66
  });
65
67
  weaverse.internal.project = project;
66
68
  weaverse.internal.pageAssignment = pageAssignment;
67
- Object.entries(components).forEach(([key, component]) => {
69
+ components.forEach((comp) => {
68
70
  weaverse.registerElement({
69
- type: component?.schema?.type || key,
70
- Component: component?.default,
71
- schema: component?.schema
71
+ type: comp?.schema?.type,
72
+ Component: comp?.default,
73
+ schema: comp?.schema
72
74
  });
73
75
  });
74
76
  return weaverse;
@@ -846,7 +848,8 @@ async function weaverseLoader(args, components, loaderConfigs = {}) {
846
848
  let items = page.items;
847
849
  page.items = await Promise.all(
848
850
  items.map(async (itemData) => {
849
- let loader = components[itemData.type]?.loader;
851
+ let type = itemData.type;
852
+ let { loader } = components.find(({ schema }) => schema?.type === type) || {};
850
853
  if (loader && typeof loader === "function") {
851
854
  try {
852
855
  return {
package/dist/index.mjs CHANGED
@@ -16,7 +16,9 @@ function createCachedWeaverseInstance(init) {
16
16
  return new Weaverse(init);
17
17
  }
18
18
  function createWeaverseInstance(weaverseData, components) {
19
- console.log("\u{1F4BF} Weaverse data", weaverseData);
19
+ if (isBrowser) {
20
+ console.log("\u{1F4BF} Weaverse data", weaverseData);
21
+ }
20
22
  let { page, configs = {}, project, pageAssignment } = weaverseData || {};
21
23
  let weaverse = createCachedWeaverseInstance({
22
24
  ...configs,
@@ -26,11 +28,11 @@ function createWeaverseInstance(weaverseData, components) {
26
28
  });
27
29
  weaverse.internal.project = project;
28
30
  weaverse.internal.pageAssignment = pageAssignment;
29
- Object.entries(components).forEach(([key, component]) => {
31
+ components.forEach((comp) => {
30
32
  weaverse.registerElement({
31
- type: component?.schema?.type || key,
32
- Component: component?.default,
33
- schema: component?.schema
33
+ type: comp?.schema?.type,
34
+ Component: comp?.default,
35
+ schema: comp?.schema
34
36
  });
35
37
  });
36
38
  return weaverse;
@@ -808,7 +810,8 @@ async function weaverseLoader(args, components, loaderConfigs = {}) {
808
810
  let items = page.items;
809
811
  page.items = await Promise.all(
810
812
  items.map(async (itemData) => {
811
- let loader = components[itemData.type]?.loader;
813
+ let type = itemData.type;
814
+ let { loader } = components.find(({ schema }) => schema?.type === type) || {};
812
815
  if (loader && typeof loader === "function") {
813
816
  try {
814
817
  return {
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.0.54",
2
+ "version": "1.0.55",
3
3
  "license": "MIT",
4
4
  "main": "dist/index.js",
5
5
  "typings": "dist/index.d.ts",
@@ -33,7 +33,7 @@
33
33
  "author": "Weaverse Team",
34
34
  "dependencies": {
35
35
  "@shopify/hydrogen": "2023.4.6",
36
- "@weaverse/react": "1.0.54"
36
+ "@weaverse/react": "1.0.55"
37
37
  },
38
38
  "devDependencies": {
39
39
  "@shopify/remix-oxygen": "^1.1.1"