fix: revision for #210

Author: Alive24

packages/demo/src/app/utils/(tools)/Molecule/Molecule.tsx

@@ -10,10 +10,10 @@ import { Textarea } from "@/src/components/Textarea";
 import { Button } from "@/src/components/Button";
 
 type Props = {
-  updateCodecMap: (token: any) => void;
+  updateCodecDefinitions: (token: any) => void;
 };
 
-export const MoleculeParser: React.FC<Props> = ({ updateCodecMap }) => {
+export const MoleculeParser: React.FC<Props> = ({ updateCodecDefinitions }) => {
   const [inputMol, setInputMol] = useState(() => {
     if (typeof window !== "undefined") {
       return localStorage.getItem("cachedMol") || "";
@@ -27,25 +27,25 @@ export const MoleculeParser: React.FC<Props> = ({ updateCodecMap }) => {
   const handleConfirm = useCallback(() => {
     try {
       // get user input schema, and append with primitive schema
-      const userCodecMap = ccc.molecule.getCodecMapFromMol(
+      const userCodecDefinitions = ccc.molecule.parseMolecule(
         inputMol + blockchainSchema,
         {
           refs: builtinCodecs,
         },
       );
-      const codecMap = mergeBuiltinCodecs(userCodecMap);
+      const CodecDefinitions = mergeBuiltinCodecs(userCodecDefinitions);
       setParseSuccess(true);
-      updateCodecMap(codecMap);
+      updateCodecDefinitions(CodecDefinitions);
       log("Successfully parsed schema");
       if (typeof window !== "undefined") {
         localStorage.setItem("cachedMol", inputMol);
       }
     } catch (error: any) {
       setParseSuccess(false);
-      updateCodecMap({});
+      updateCodecDefinitions({});
       error(error.message);
     }
-  }, [inputMol, log, updateCodecMap]);
+  }, [inputMol, log, updateCodecDefinitions]);
 
   return (
     <div style={{ marginBottom: 16 }}>

packages/demo/src/app/utils/(tools)/Molecule/SchemaSelect.tsx

@@ -3,30 +3,30 @@ import { ccc } from "@ckb-ccc/connector-react";
 import { Dropdown } from "@/src/components/Dropdown";
 
 type Props = {
-  codecMap: ccc.molecule.CodecMap;
+  CodecDefinitions: ccc.molecule.CodecDefinitions;
   selectedCodecName: string;
   onSelectCodec: (name: string) => void;
   mode: "decode" | "encode";
   onSelectMode: (mode: "decode" | "encode") => void;
 };
 
 const createCodecOptionsFromMap = (
-  codecMap: ccc.molecule.CodecMap,
+  CodecDefinitions: ccc.molecule.CodecDefinitions,
 ): string[] => {
-  return Object.keys(codecMap);
+  return Object.keys(CodecDefinitions);
 };
 
 export const SchemaSelect: React.FC<Props> = ({
   onSelectCodec,
   selectedCodecName,
-  codecMap,
+  CodecDefinitions,
   mode,
   onSelectMode,
 }) => {
   const handleChange = (newValue: string | null) => {
     onSelectCodec(newValue as string);
   };
-  const schemaOptions = createCodecOptionsFromMap(codecMap).map((schema) => ({
+  const schemaOptions = createCodecOptionsFromMap(CodecDefinitions).map((schema) => ({
     name: schema,
     displayName: schema,
     iconName: "Hash" as const,

packages/demo/src/app/utils/(tools)/Molecule/constants.ts

@@ -3,7 +3,7 @@ import { ccc } from "@ckb-ccc/connector-react";
 /**
  * built-in re-writable codecs
  */
-export const builtinCodecs: ccc.molecule.CodecMap = {
+export const builtinCodecs: ccc.molecule.CodecDefinitions = {
   Uint8: ccc.mol.Uint8,
   Uint16: ccc.mol.Uint16,
   Uint32: ccc.mol.Uint32,
@@ -26,8 +26,8 @@ export const builtinCodecs: ccc.molecule.CodecMap = {
  * @param userTokens
  */
 export const mergeBuiltinCodecs = (
-  userCodecs: ccc.molecule.CodecMap,
-): ccc.molecule.CodecMap => {
+  userCodecs: ccc.molecule.CodecDefinitions,
+): ccc.molecule.CodecDefinitions => {
   return { ...userCodecs, ...builtinCodecs };
 };
 

packages/demo/src/app/utils/(tools)/Molecule/page.tsx

@@ -18,15 +18,15 @@ export default function Molecule() {
   const { createSender } = useApp();
   const { log } = createSender("Molecule");
 
-  const [codecMap, setCodecMap] = useState<ccc.molecule.CodecMap>({});
+  const [CodecDefinitions, setCodecDefinitions] = useState<ccc.molecule.CodecDefinitions>({});
   const [selectedCodecName, setSelectedCodecName] = useState<string>("");
   const [mode, setMode] = useState<"decode" | "encode">("decode");
-  const handleCodecMap = useCallback(
-    (codecMap: ccc.molecule.CodecMap) => {
-      setCodecMap(codecMap);
-      setSelectedCodecName(Object.keys(codecMap)[0]);
+  const handleCodecDefinitions = useCallback(
+    (CodecDefinitions: ccc.molecule.CodecDefinitions) => {
+      setCodecDefinitions(CodecDefinitions);
+      setSelectedCodecName(Object.keys(CodecDefinitions)[0]);
     },
-    [setCodecMap, setSelectedCodecName],
+    [setCodecDefinitions, setSelectedCodecName],
   );
 
   const handleSelectCodec = (name: string) => {
@@ -40,30 +40,30 @@ export default function Molecule() {
       cachedMol = "";
     }
 
-    const userCodecMap = ccc.molecule.getCodecMapFromMol(
+    const userCodecDefinitions = ccc.molecule.parseMolecule(
       cachedMol + blockchainSchema,
       {
-        refs: builtinCodecs,
+        extraReferences: builtinCodecs,
       },
     );
-    const codecMap = mergeBuiltinCodecs(userCodecMap);
-    handleCodecMap(codecMap);
-  }, [handleCodecMap]);
+    const CodecDefinitions = mergeBuiltinCodecs(userCodecDefinitions);
+    handleCodecDefinitions(CodecDefinitions);
+  }, [handleCodecDefinitions]);
 
   return (
     <div className="flex w-full flex-col items-stretch">
-      <MoleculeParser updateCodecMap={handleCodecMap} />
-      {Object.keys(codecMap).length > 0 && (
+      <MoleculeParser updateCodecDefinitions={handleCodecDefinitions} />
+      {Object.keys(CodecDefinitions).length > 0 && (
         <SchemaSelect
           selectedCodecName={selectedCodecName}
-          codecMap={codecMap}
+          CodecDefinitions={CodecDefinitions}
           onSelectCodec={handleSelectCodec}
           mode={mode}
           onSelectMode={setMode}
         />
       )}
-      {Object.keys(codecMap).length > 0 && selectedCodecName !== "" && (
-        <DataInput codec={codecMap[selectedCodecName]} mode={mode} />
+      {Object.keys(CodecDefinitions).length > 0 && selectedCodecName !== "" && (
+        <DataInput codec={CodecDefinitions[selectedCodecName]} mode={mode} />
       )}
     </div>
   );

packages/molecule/README.md

@@ -36,7 +36,7 @@
   Fully enabling CKB's Turing completeness and cryptographic freedom power.
 </p>
 
-Get `CodecMap` from Molecule schema.
+Get `CodecDefinitions` from Molecule schema.
 
 <h3 align="center">
   Read more about CCC on <a href="https://docs.ckbccc.com">our website</a> or <a href="https://github.com/ckb-devrel/ccc">GitHub Repo</a>.

packages/molecule/jest.config.js

@@ -11,4 +11,7 @@ module.exports = {
       { tsconfig: "tsconfig.json" },
     ],
   },
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1", // strip .js extension for imports
+  },
 };

packages/molecule/src/barrel.ts

@@ -1,2 +1,2 @@
-export * from "./molecule";
-export * from "./type";
+export * from "./molecule.js";
+export * from "./type.js";