@ocap/asset 1.28.8 → 1.29.0

package/README.md

@@ -1,6 +1,5 @@
 ![nft](https://www.arcblock.io/.netlify/functions/badge/?text=Asset+Factory)
 
-[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![docs](https://img.shields.io/badge/powered%20by-arcblock-green.svg)](https://docs.arcblock.io)
 [![Gitter](https://badges.gitter.im/ArcBlock/community.svg)](https://gitter.im/ArcBlock/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

package/esm/index.mjs

@@ -28,7 +28,7 @@ const isValidNotation = (notation) => [
 	"ctx",
 	"data",
 	"input"
-].includes(notation.split(".").shift());
+].includes(notation.split(".").shift() ?? "");
 const isValidHook = (hook, quota, throwOnError = false) => {
 	if (SUPPORTED_HOOK_TYPES.includes(hook.type) === false) return false;
 	if (SUPPORTED_HOOK_NAMES.includes(hook.name) === false) return false;
@@ -108,10 +108,10 @@ const mintFromFactory = ({ factory, inputs, owner, issuer }) => {
 	}, null, 2));
 	const asset = JSON.parse(mustache.render(JSON.stringify(output), {
 		input: inputs,
-		data: data.value || data,
+		data: data?.value || data,
 		ctx: {
 			factory: factoryAddress,
-			id: numMinted + 1,
+			id: (numMinted ?? 0) + 1,
 			owner,
 			issuer
 		}
@@ -137,6 +137,8 @@ const mintFromFactory = ({ factory, inputs, owner, issuer }) => {
 */
 const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 	if (Object.keys(inputs).some((x) => typeof inputs[x] !== "string")) throw new Error("Failed to mint asset from factory: input values must be strings");
+	if (!factory) throw new Error("Failed to mint asset from factory: factory is required");
+	if (!issuer) throw new Error("Failed to mint asset from factory: issuer is required");
 	let asset = null;
 	const { output, numMinted, address: factoryAddress, data } = factory;
 	const { wallet, name } = issuer;
@@ -160,10 +162,10 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 			...inputs,
 			...extra
 		},
-		data: data.value || data,
+		data: data?.value || data,
 		ctx: {
 			factory: factoryAddress,
-			id: numMinted + 1,
+			id: (numMinted ?? 0) + 1,
 			owner,
 			issuer: issuerObject
 		}
@@ -179,21 +181,22 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 			const vcRootPath = key.split(".").slice(0, -1).join(".");
 			const vcIdPath = vcRootPath.split(".").concat(["id"]).join(".");
 			const typeInfo = toTypeInfo(issuerObject.id);
+			const pkType = typeInfo.pk;
 			const vcType = {
 				...typeInfo,
 				role: types.RoleType.ROLE_VC
 			};
 			const vcId = fromPublicKeyHash(wallet.hash(stableStringify(subjectObject)), vcType);
 			extra.id = vcId;
-			extra.proofType = proofTypes[typeInfo.pk];
+			extra.proofType = proofTypes[pkType];
 			set(template, vcIdPath, vcId);
-			if (!proofTypes[typeInfo.pk]) throw new Error("Unsupported signer type when create verifiable credential");
+			if (!proofTypes[pkType]) throw new Error("Unsupported signer type when create verifiable credential");
 			let vcObj = render(get(template, vcRootPath));
 			vcObj.proof = void 0;
 			const vcStr = stableStringify(vcObj);
 			const signature = toBase64(await wallet.sign(vcStr));
 			vcObj.proof = {
-				type: proofTypes[typeInfo.pk],
+				type: proofTypes[pkType],
 				created: extra.issuanceDate,
 				proofPurpose: "assertionMethod",
 				jws: signature
@@ -231,12 +234,14 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 const formatFactoryState = (state) => {
 	const { address, output, data, numMinted } = state;
 	const outputX = cloneDeep(output);
-	outputX.data.value = JSON.parse(outputX.data.value);
-	outputX.data.type = outputX.data.typeUrl;
+	const outputData = outputX.data;
+	outputData.value = JSON.parse(outputData.value);
+	outputData.type = outputData.typeUrl;
+	const stateData = data;
 	return {
 		address,
 		output: outputX,
-		data: data.value ? JSON.parse(data.value) : {},
+		data: stateData?.value ? JSON.parse(stateData.value) : {},
 		numMinted
 	};
 };

package/lib/index.cjs

@@ -39,7 +39,7 @@ const isValidNotation = (notation) => [
 	"ctx",
 	"data",
 	"input"
-].includes(notation.split(".").shift());
+].includes(notation.split(".").shift() ?? "");
 const isValidHook = (hook, quota, throwOnError = false) => {
 	if (SUPPORTED_HOOK_TYPES.includes(hook.type) === false) return false;
 	if (SUPPORTED_HOOK_NAMES.includes(hook.name) === false) return false;
@@ -119,10 +119,10 @@ const mintFromFactory = ({ factory, inputs, owner, issuer }) => {
 	}, null, 2));
 	const asset = JSON.parse(mustache.default.render(JSON.stringify(output), {
 		input: inputs,
-		data: data.value || data,
+		data: data?.value || data,
 		ctx: {
 			factory: factoryAddress,
-			id: numMinted + 1,
+			id: (numMinted ?? 0) + 1,
 			owner,
 			issuer
 		}
@@ -148,6 +148,8 @@ const mintFromFactory = ({ factory, inputs, owner, issuer }) => {
 */
 const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 	if (Object.keys(inputs).some((x) => typeof inputs[x] !== "string")) throw new Error("Failed to mint asset from factory: input values must be strings");
+	if (!factory) throw new Error("Failed to mint asset from factory: factory is required");
+	if (!issuer) throw new Error("Failed to mint asset from factory: issuer is required");
 	let asset = null;
 	const { output, numMinted, address: factoryAddress, data } = factory;
 	const { wallet, name } = issuer;
@@ -171,10 +173,10 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 			...inputs,
 			...extra
 		},
-		data: data.value || data,
+		data: data?.value || data,
 		ctx: {
 			factory: factoryAddress,
-			id: numMinted + 1,
+			id: (numMinted ?? 0) + 1,
 			owner,
 			issuer: issuerObject
 		}
@@ -190,21 +192,22 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 			const vcRootPath = key.split(".").slice(0, -1).join(".");
 			const vcIdPath = vcRootPath.split(".").concat(["id"]).join(".");
 			const typeInfo = (0, _arcblock_did.toTypeInfo)(issuerObject.id);
+			const pkType = typeInfo.pk;
 			const vcType = {
 				...typeInfo,
 				role: _ocap_mcrypto.types.RoleType.ROLE_VC
 			};
 			const vcId = (0, _arcblock_did.fromPublicKeyHash)(wallet.hash((0, _arcblock_vc.stableStringify)(subjectObject)), vcType);
 			extra.id = vcId;
-			extra.proofType = _arcblock_vc.proofTypes[typeInfo.pk];
+			extra.proofType = _arcblock_vc.proofTypes[pkType];
 			(0, lodash_set.default)(template, vcIdPath, vcId);
-			if (!_arcblock_vc.proofTypes[typeInfo.pk]) throw new Error("Unsupported signer type when create verifiable credential");
+			if (!_arcblock_vc.proofTypes[pkType]) throw new Error("Unsupported signer type when create verifiable credential");
 			let vcObj = render((0, lodash_get.default)(template, vcRootPath));
 			vcObj.proof = void 0;
 			const vcStr = (0, _arcblock_vc.stableStringify)(vcObj);
 			const signature = (0, _ocap_util.toBase64)(await wallet.sign(vcStr));
 			vcObj.proof = {
-				type: _arcblock_vc.proofTypes[typeInfo.pk],
+				type: _arcblock_vc.proofTypes[pkType],
 				created: extra.issuanceDate,
 				proofPurpose: "assertionMethod",
 				jws: signature
@@ -242,12 +245,14 @@ const preMintFromFactory = async ({ factory, inputs, owner, issuer }) => {
 const formatFactoryState = (state) => {
 	const { address, output, data, numMinted } = state;
 	const outputX = (0, lodash_cloneDeep.default)(output);
-	outputX.data.value = JSON.parse(outputX.data.value);
-	outputX.data.type = outputX.data.typeUrl;
+	const outputData = outputX.data;
+	outputData.value = JSON.parse(outputData.value);
+	outputData.type = outputData.typeUrl;
+	const stateData = data;
 	return {
 		address,
 		output: outputX,
-		data: data.value ? JSON.parse(data.value) : {},
+		data: stateData?.value ? JSON.parse(stateData.value) : {},
 		numMinted
 	};
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@ocap/asset",
   "description": "Utility to work with asset and factory on ArcBlock blockchain",
   "type": "module",
-  "version": "1.28.8",
+  "version": "1.29.0",
   "author": {
     "name": "wangshijun",
     "email": "shijun@arcblock.io",
@@ -19,30 +19,28 @@
     "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
   ],
   "dependencies": {
-    "@arcblock/did": "1.28.8",
-    "@arcblock/did-util": "1.28.8",
-    "@arcblock/validator": "1.28.8",
-    "@arcblock/vc": "1.28.8",
-    "@ocap/contract": "1.28.8",
-    "@ocap/mcrypto": "1.28.8",
-    "@ocap/types": "1.28.8",
-    "@ocap/util": "1.28.8",
-    "@ocap/wallet": "1.28.8",
-    "debug": "^4.3.6",
+    "@arcblock/did": "1.29.0",
+    "@arcblock/did-util": "1.29.0",
+    "@arcblock/validator": "1.29.0",
+    "@arcblock/vc": "1.29.0",
+    "@ocap/contract": "1.29.0",
+    "@ocap/mcrypto": "1.29.0",
+    "@ocap/types": "1.29.0",
+    "@ocap/util": "1.29.0",
+    "@ocap/wallet": "1.29.0",
+    "debug": "^4.4.3",
     "flat": "^5.0.2",
     "is-absolute-url": "^3.0.3",
     "json-stable-stringify": "^1.0.1",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "mustache": "^4.2.0"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",
     "@types/mustache": "^4.2.5",
     "@types/node": "^22.7.5",
-    "prettier": "^3.3.2",
     "tsdown": "^0.18.4",
-    "type-fest": "^3.1.0",
-    "typescript": "^5.6.2"
+    "type-fest": "^3.1.0"
   },
   "homepage": "https://github.com/ArcBlock/blockchain/tree/master/core/asset",
   "keywords": [