@unchainedshop/api 2.0.0-beta5 → 2.0.0-beta6

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 (7) hide show
  1. package/lib/createERCMetadataServer.js +8 -12
  2. package/lib/createERCMetadataServer.js.map +1 -1
  3. package/lib/resolvers/type/token-types.js +2 -1
  4. package/lib/resolvers/type/token-types.js.map +1 -1
  5. package/package.json +7 -7
  6. package/src/createERCMetadataServer.ts +8 -14
  7. package/src/resolvers/type/token-types.ts +2 -1
package/lib/createERCMetadataServer.js CHANGED
@@ -27,22 +27,18 @@ const ercMetadataMiddleware = async (req, res) => {
27
27
  const parsedPath = path.parse(url.pathname);
28
28
  if (parsedPath.ext !== '.json')
29
29
  throw new Error('Invalid ERC Metadata URI');
30
- const [, productIdOrContractAddress, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
30
+ const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
31
31
  const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
32
32
  const chainTokenId = parsedPath.name;
33
- const productByProductId = await resolvedContext.modules.products.findProduct({
34
- productId: productIdOrContractAddress,
33
+ const product = await resolvedContext.modules.products.findProduct({
34
+ productId,
35
35
  });
36
- const selector = {
36
+ const [token] = await resolvedContext.modules.warehousing.findTokens({
37
37
  chainTokenId,
38
- contractAddress: productByProductId?.tokenization?.contractAddress || productIdOrContractAddress,
39
- };
40
- const [token] = await resolvedContext.modules.warehousing.findTokens(selector);
41
- const product = productByProductId ||
42
- (await resolvedContext.modules.products.findProduct({
43
- productId: token?.productId,
44
- }));
45
- const ercMetadata = await resolvedContext.modules.warehousing.tokenMetadata(token, {
38
+ contractAddress: product?.tokenization?.contractAddress,
39
+ });
40
+ const ercMetadata = await resolvedContext.modules.warehousing.tokenMetadata(chainTokenId, {
41
+ token,
46
42
  product,
47
43
  referenceDate: new Date(),
48
44
  }, { ...resolvedContext, localeContext: new Locale(locale) });
package/lib/createERCMetadataServer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createERCMetadataServer.js","sourceRoot":"","sources":["../src/createERCMetadataServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createERCMetadataServer.js","sourceRoot":"","sources":["../src/createERCMetadataServer.ts"],"names":[],"mappings":"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"}
package/lib/resolvers/type/token-types.js CHANGED
@@ -26,7 +26,8 @@ export const Token = {
26
26
  ercMetadata: async (token, { forceLocale }, context) => {
27
27
  const { modules } = context;
28
28
  const product = await modules.products.findProduct({ productId: token.productId });
29
- const ercMetadata = await modules.warehousing.tokenMetadata(token, {
29
+ const ercMetadata = await modules.warehousing.tokenMetadata(token.chainTokenId, {
30
+ token,
30
31
  product,
31
32
  referenceDate: new Date(),
32
33
  }, { ...context, localeContext: new Locale(forceLocale) });
package/lib/resolvers/type/token-types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/token-types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAkB,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAe7B,MAAM,CAAC,MAAM,KAAK,GAAqB;IACrC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5C,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACxC,OAAO,WAAW,CAAC,aAAa,CAAC;SAClC;QACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;YACnD,KAAK,EAAE,CAAC,cAAc,CAAC;YACvB,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC;YAAE,OAAO,WAAW,CAAC,SAAS,CAAC;QACjG,OAAO,WAAW,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;QACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QACnF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,CACzD,KAAK,EACL;YACE,OAAO;YACP,aAAa,EAAE,IAAI,IAAI,EAAE;SAC1B,EACD,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,CACvD,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"token-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/token-types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAkB,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAe7B,MAAM,CAAC,MAAM,KAAK,GAAqB;IACrC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,IAAI,CAAC,KAAK,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC/B,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5C,IAAI,KAAK,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACxC,OAAO,WAAW,CAAC,aAAa,CAAC;SAClC;QACD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;YACnD,KAAK,EAAE,CAAC,cAAc,CAAC;YACvB,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC;SAC/C,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC;YAAE,OAAO,WAAW,CAAC,SAAS,CAAC;QACjG,OAAO,WAAW,CAAC,WAAW,CAAC;IACjC,CAAC;IAED,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;QACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;QACnF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,CACzD,KAAK,CAAC,YAAY,EAClB;YACE,KAAK;YACL,OAAO;YACP,aAAa,EAAE,IAAI,IAAI,EAAE;SAC1B,EACD,EAAE,GAAG,OAAO,EAAE,aAAa,EAAE,IAAI,MAAM,CAAC,WAAW,CAAC,EAAE,CACvD,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/api",
3
- "version": "2.0.0-beta5",
3
+ "version": "2.0.0-beta6",
4
4
  "main": "lib/api-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/api-index.js",
@@ -36,11 +36,11 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@metamask/eth-sig-util": "^5.0.0",
39
- "@unchainedshop/core": "^2.0.0-beta5",
40
- "@unchainedshop/events": "^2.0.0-beta5",
41
- "@unchainedshop/logger": "^2.0.0-beta5",
42
- "@unchainedshop/roles": "^2.0.0-beta5",
43
- "@unchainedshop/utils": "^2.0.0-beta5",
39
+ "@unchainedshop/core": "^2.0.0-beta6",
40
+ "@unchainedshop/events": "^2.0.0-beta6",
41
+ "@unchainedshop/logger": "^2.0.0-beta6",
42
+ "@unchainedshop/roles": "^2.0.0-beta6",
43
+ "@unchainedshop/utils": "^2.0.0-beta6",
44
44
  "accounting": "0.4.1",
45
45
  "dataloader": "^2.1.0",
46
46
  "graphql-scalars": "^1.20.0",
@@ -53,7 +53,7 @@
53
53
  "@types/graphql-upload": "^8.0.12",
54
54
  "@types/locale": "^0.1.1",
55
55
  "@types/node": "^16.18.2",
56
- "@unchainedshop/types": "^2.0.0-beta5",
56
+ "@unchainedshop/types": "^2.0.0-beta6",
57
57
  "apollo-server-express": "^2.26.0",
58
58
  "graphql": "^15.8.0",
59
59
  "jest": "^29.2.2",
package/src/createERCMetadataServer.ts CHANGED
@@ -38,30 +38,24 @@ const ercMetadataMiddleware = async (req: IncomingMessage & { unchainedContext?:
38
38
 
39
39
  if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
40
40
 
41
- const [, productIdOrContractAddress, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
41
+ const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
42
42
 
43
43
  const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
44
44
  const chainTokenId = parsedPath.name;
45
45
 
46
- const productByProductId = await resolvedContext.modules.products.findProduct({
47
- productId: productIdOrContractAddress,
46
+ const product = await resolvedContext.modules.products.findProduct({
47
+ productId,
48
48
  });
49
49
 
50
- const selector: any = {
50
+ const [token] = await resolvedContext.modules.warehousing.findTokens({
51
51
  chainTokenId,
52
- contractAddress: productByProductId?.tokenization?.contractAddress || productIdOrContractAddress,
53
- };
54
- const [token] = await resolvedContext.modules.warehousing.findTokens(selector);
55
-
56
- const product =
57
- productByProductId ||
58
- (await resolvedContext.modules.products.findProduct({
59
- productId: token?.productId,
60
- }));
52
+ contractAddress: product?.tokenization?.contractAddress,
53
+ });
61
54
 
62
55
  const ercMetadata = await resolvedContext.modules.warehousing.tokenMetadata(
63
- token,
56
+ chainTokenId,
64
57
  {
58
+ token,
65
59
  product,
66
60
  referenceDate: new Date(),
67
61
  },
package/src/resolvers/type/token-types.ts CHANGED
@@ -46,8 +46,9 @@ export const Token: TokenHelperTypes = {
46
46
  const { modules } = context;
47
47
  const product = await modules.products.findProduct({ productId: token.productId });
48
48
  const ercMetadata = await modules.warehousing.tokenMetadata(
49
- token,
49
+ token.chainTokenId,
50
50
  {
51
+ token,
51
52
  product,
52
53
  referenceDate: new Date(),
53
54
  },