motoko 3.0.0-beta7 → 3.0.0-beta8

package/src/ast.ts

@@ -10,27 +10,18 @@ export type Span = [number, number];
 export type AST = AST[] | Node | string | null;
 
 export interface Source {
-    file?: string;
-    start?: Span;
-    end?: Span;
+    file: string;
+    start: Span;
+    end: Span;
 }
 
-export interface Node extends Source {
+export interface Node extends Partial<Source> {
     name: string;
-    file?: string;
-    start?: Span;
-    end?: Span;
-    type?: Node;
+    type?: string;
     declaration?: Source;
     args?: AST[];
 }
 
-// export type TypeAST = AST[] | Node | string | number | null;
-// export type TypeNode = {
-//     name: string;
-//     args: TypeAST[];
-// };
-
 export function simplifyAST(ast: CompilerNode): Node;
 export function simplifyAST(ast: CompilerAST[]): AST[];
 export function simplifyAST<T extends CompilerAST>(ast: T): T;
@@ -48,23 +39,26 @@ export function simplifyAST(ast: CompilerAST): AST {
             CompilerSpan,
             CompilerAST,
         ];
-        return {
+        const node: Node = {
             ...(typeof subAst === 'string'
                 ? { name: subAst }
-                : simplifyAST(subAst)),
-            file: start.args[0],
+                : simplifyAST(subAst as any as CompilerNode)),
             start: [+start.args[1], +start.args[2]],
             end: [+end.args[1], +end.args[2]],
         };
+        const file = start.args[0];
+        if (file) {
+            node.file = file;
+        }
+        return node;
     }
     if (ast.name === ':') {
-        const [typeAst, type] = ast.args as [CompilerAST, CompilerNode];
-        // console.log(typeAst); ////
+        const [typeAst, type] = ast.args as [CompilerAST, string];
         return {
             ...(typeof typeAst === 'string'
                 ? { name: typeAst }
                 : simplifyAST(typeAst)),
-            type: simplifyAST(type),
+            type,
         };
     }
     return {
@@ -72,5 +66,3 @@ export function simplifyAST(ast: CompilerAST): AST {
         args: simplifyAST(ast.args),
     };
 }
-
-// export function getTypeString(type: Type) {}

package/src/package.ts

@@ -26,126 +26,6 @@ export interface PackageFile {
     content: string;
 }
 
-// TODO: call `fetchPackage` instead of deprecated functions
-async function loadPackage(mo: Motoko, info: PackageInfo) {
-    if (
-        !info.repo.startsWith('https://github.com/') ||
-        !info.repo.endsWith('.git')
-    ) {
-        return false;
-    }
-    const repo = {
-        name: info.name,
-        version: info.version,
-        repo: info.repo.slice(0, -4).replace(/^(https:\/\/github.com\/)/, ''),
-        branch: info.version,
-        dir: info.dir || 'src',
-    };
-    const result = await fetchGithub_(mo, repo, info.name);
-    if (result) {
-        mo.usePackage(info.name, info.name + '/');
-    }
-    return result ? true : false;
-}
-
-/** @deprecated */
-async function fetchGithub_(mo: Motoko, info: PackageInfo, directory = '') {
-    const possiblyCDN = !(
-        (info.branch.length % 2 === 0 && /^[A-F0-9]+$/i.test(info.branch)) ||
-        info.branch === 'master' ||
-        info.branch === 'main'
-    );
-    if (possiblyCDN) {
-        const result = await fetchFromCDN_(mo, info, directory);
-        if (result) {
-            return result;
-        }
-    }
-    return await fetchFromGithub_(mo, info, directory);
-}
-
-// function saveWorkplaceToMotoko(mo, files) {
-//     for (const [name, code] of Object.entries(files)) {
-//         if (!name.endsWith('mo')) continue;
-//         mo.addFile(name, code);
-//     }
-// }
-
-/** @deprecated */
-async function fetchFromCDN_(mo: Motoko, info: PackageInfo, directory = '') {
-    const meta_url = `https://data.jsdelivr.com/v1/package/gh/${info.repo}@${info.branch}/flat`;
-    const base_url = `https://cdn.jsdelivr.net/gh/${info.repo}@${info.branch}`;
-    const response = await fetch(meta_url);
-    const json = await response.json();
-    if (!json.hasOwnProperty('files')) {
-        throw new Error(json.message || `Could not fetch from CDN: ${info}`);
-    }
-    const promises: Promise<void>[] = [];
-    const files: Record<string, string> = {};
-    for (const f of json.files) {
-        if (f.name.startsWith(`/${info.dir}/`) && /\.mo$/.test(f.name)) {
-            const promise = (async () => {
-                const content = await (await fetch(base_url + f.name)).text();
-                const stripped =
-                    directory +
-                    f.name.slice(info.dir ? info.dir.length + 1 : 0);
-                mo.write(stripped, content);
-                files[stripped] = content;
-            })();
-            promises.push(promise);
-        }
-    }
-    if (!promises.length) {
-        return;
-    }
-    return Promise.all(promises).then(() => {
-        return files;
-    });
-}
-
-/** @deprecated */
-async function fetchFromGithub_(
-    mo: Motoko,
-    info: PackageInfo,
-    directory: string = '',
-) {
-    const meta_url = `https://api.github.com/repos/${info.repo}/git/trees/${info.branch}?recursive=1`;
-    const base_url = `https://raw.githubusercontent.com/${info.repo}/${info.branch}/`;
-    const response = await fetch(meta_url);
-    const json = await response.json();
-    if (!json.hasOwnProperty('tree')) {
-        throw new Error(
-            json.message || `Could not fetch from GitHub repository: ${info}`,
-        );
-    }
-    const promises: Promise<void>[] = [];
-    const files: Record<string, string> = {};
-    for (const f of json.tree) {
-        if (
-            f.path.startsWith(info.dir ? `${info.dir}/` : '') &&
-            f.type === 'blob' &&
-            /\.mo$/.test(f.path)
-        ) {
-            const promise = (async () => {
-                const content = await (await fetch(base_url + f.path)).text();
-                const stripped =
-                    directory +
-                    (directory ? '/' : '') +
-                    f.path.slice(info.dir ? info.dir.length + 1 : 0);
-                mo.write(stripped, content);
-                files[stripped] = content;
-            })();
-            promises.push(promise);
-        }
-    }
-    if (!promises.length) {
-        return;
-    }
-    return Promise.all(promises).then(() => {
-        return files;
-    });
-}
-
 function parseGithubPackageInfo(path: string | PackageInfo): PackageInfo {
     if (!path) {
         return;
@@ -302,12 +182,10 @@ export async function installPackages(
     packages: Record<string, string | PackageInfo>,
 ) {
     await Promise.all(
-        Object.entries(packages).map(([name, path]) => {
-            const info = {
-                ...parseGithubPackageInfo(path),
-                name,
-            };
-            return loadPackage(mo, info);
+        Object.entries(packages).map(async ([name, info]) => {
+            const pkg = await fetchPackage(name, info);
+            mo.loadPackage(pkg);
+            return pkg;
         }),
     );
 }